Fix items given again

Author: 尧杰 曾

CDK/DatabaseManager.cs

@@ -54,20 +54,44 @@ public RedeemCDKResult RedeemCDK(UnturnedPlayer player, string CDK)
 
                         if (cdkdata.Items != string.Empty && cdkdata.Amount == string.Empty)
                         {
-                            foreach (string item in cdkdata.Items.Split(','))
+                            //foreach (string item in cdkdata.Items.Split(','))
+                            //{
+                            //    player.GiveItem(Convert.ToUInt16(item), 1);
+                            //}
+                            var items = cdkdata.Items.Split(',');
+                            for(int i = 0;i<items.Length;i++)
                             {
-                                player.GiveItem(Convert.ToUInt16(item), 1);
+                               if(ushort.TryParse(items[i], out ushort id))
+                                {
+                                    player.GiveItem(id,1);
+                                }
                             }
                         }
                         else if (cdkdata.Items != string.Empty && cdkdata.Amount != string.Empty)
                         {
-                            foreach (string item in cdkdata.Items.Split(','))
+                            var items = cdkdata.Items.Split(',');
+                            var amount = cdkdata.Items.Split(',');
+                            if(items.Length == amount.Length)
                             {
-                                foreach (string amount in cdkdata.Amount.Split(','))
+                                for(int i = 0;i<amount.Length;i++)
                                 {
-                                    player.GiveItem(Convert.ToUInt16(item), Convert.ToByte(amount));
+                                    try
+                                    { 
+                                        if(!player.GiveItem(Convert.ToUInt16(items[i]), Convert.ToByte( amount[i])))
+                                        {
+                                            UnturnedChat.Say(player, Main.Instance.Translate("items_give_fail"), UnityEngine.Color.red);
+                                        }
+                                    }
+                                    catch
+                                    {
+                                        UnturnedChat.Say(player, Main.Instance.Translate("cdk_config_error"), UnityEngine.Color.red);
+                                    }
                                 }
                             }
+                            else
+                            {
+                                UnturnedChat.Say(player, Main.Instance.Translate("cdk_config_error"), UnityEngine.Color.red);
+                            }
                         }
 
                         if (cdkdata.Vehicle != 0)
@@ -136,7 +160,14 @@ public RedeemCDKResult RedeemCDK(UnturnedPlayer player, string CDK)
                         }
                         else
                         {
-                            PermissionSync.Main.Instance.databese.UpdatePermission(player, cdkdata.GrantPermissionGroup, cdkdata.ValidUntil, "CDKPlugin");
+                            Main.ExecuteDependencyCode("PermissionSync", (IRocketPlugin ps) =>
+                            {
+                                if (ps.State == PluginState.Loaded)
+                                {
+                                    //PermissionSync.Main.Instance.databese.AddPermission("CDKPlugin", player, cdkdata.GrantPermissionGroup, cdkdata.ValidUntil.ToString());
+                                    PermissionSync.Main.Instance.databese.UpdatePermission(player, cdkdata.GrantPermissionGroup, cdkdata.ValidUntil, "CDKPlugin");
+                                }
+                            });
                             UpdateLogInDB(new LogData(CDK, player.CSteamID, DateTime.Now, cdkdata.ValidUntil, cdkdata.GrantPermissionGroup, cdkdata.UsePermissionSync));
                             UpdateRenew(CDK);
                         }

CDK/Main.cs

@@ -350,7 +350,8 @@ private void PlayerConnect(UnturnedPlayer player)
                 {"key_expired","Your key has been expired:{0}" },
                 {"already_purchased","You already purchased this permission group" },
                 {"invaild_param","Wrong usage.usage:{0}"},
-                {"player_not_match","This CDK not belong to you!" }
+                {"player_not_match","This CDK not belong to you!" },
+                {"cdk_config_error","CDK configuration error.please contact server owner!" }
             };
     }
 }

CDK/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2.0.7")]
-[assembly: AssemblyFileVersion("3.2.0.7")]
+[assembly: AssemblyVersion("3.2.1.0")]
+[assembly: AssemblyFileVersion("3.2.1.0")]