Fixed issue with kits and more

UserR00T · UserR00T · commit d7f526cda256 · 2018-08-14T22:36:37.000+02:00
- Fixed issue with reload permissions
- Fixed issue with cooldown timer not actually starting from the time it left off when you restart the server
- Fixed ``InvalidOperationException`` when loading cooldown's for kits
diff --git a/source/BP-Essentials/Chat/Commands/Admin/DebugCommands.cs b/source/BP-Essentials/Chat/Commands/Admin/DebugCommands.cs
@@ -62,7 +62,20 @@ public static void Run(SvPlayer player, string message)
                         if (arg2 == "item")
                         {
                             // Jesus o.O
-                            if (v.GetType() == typeof(ShPlaceable) || v.GetType() == typeof(ShPlaceable) || v.GetType() == typeof(ShGun) || v.GetType() == typeof(ShWeapon) || v.GetType() == typeof(ShFurniture) || v.GetType() == typeof(ShWearable) || v.GetType() == typeof(ShConsumable) || v.GetType() == typeof(ShDrugMaterial) || v.GetType() == typeof(ShExtinguisher) || v.GetType() == typeof(ShHealer) || v.GetType() == typeof(ShRestraint) || v.GetType() == typeof(ShSeed) || v.GetType() == typeof(ShProjectile))
+                            if (v.GetType() == typeof(ShPlaceable)
+                                || v.GetType() == typeof(ShPlaceable)
+                                || v.GetType() == typeof(ShGun)
+                                || v.GetType() == typeof(ShWeapon)
+                                || v.GetType() == typeof(ShFurniture)
+                                || v.GetType() == typeof(ShWearable)
+                                || v.GetType() == typeof(ShConsumable)
+                                || v.GetType() == typeof(ShDrugMaterial)
+                                || v.GetType() == typeof(ShExtinguisher)
+                                || v.GetType() == typeof(ShHealer)
+                                || v.GetType() == typeof(ShRestraint)
+                                || v.GetType() == typeof(ShSeed)
+                                || v.GetType() == typeof(ShProjectile)
+                                || v.GetType() == typeof(ShDetonator))
                             {
                                 sb.Append($"{{\"name\": \"{v.name}\",\"id\": {currIndex},\"gameid\": {v.index}}},\n");
                                 ++currIndex;
diff --git a/source/BP-Essentials/Chat/Commands/Admin/Reload.cs b/source/BP-Essentials/Chat/Commands/Admin/Reload.cs
@@ -12,10 +12,7 @@ class Reload : EssentialsChatPlugin
     {
         public static void Run(SvPlayer player)
         {
-            if (player.player.admin)
-                BP_Essentials.Reload.Run(false, player);
-            else
-                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, MsgNoPerm);
+            BP_Essentials.Reload.Run(false, player);
         }
     }
 }
diff --git a/source/BP-Essentials/EssentialsVariables.cs b/source/BP-Essentials/EssentialsVariables.cs
@@ -7,7 +7,7 @@ namespace BP_Essentials
 {
     public class EssentialsVariablesPlugin : EssentialsCorePlugin
     {
-        public const string Version = "2.5.4";
+        public const string Version = "2.5.6";
         public static bool isPreRelease;
 
         // Generic Constants
diff --git a/source/BP-Essentials/Methods/FileHandler/Kits.cs b/source/BP-Essentials/Methods/FileHandler/Kits.cs
@@ -26,9 +26,9 @@ public static void LoadAllKits(bool firstLoad = false)
                     continue;
                 }
                 listKits.Add(obj);
-                if (firstLoad)
-                    foreach (var player in obj.CurrentlyInCooldown)
-                        SvMan.StartCoroutine(KitCooldown(player.Key, obj));
+                if (firstLoad && obj.CurrentlyInCooldown != null)
+                    foreach (var player in obj.CurrentlyInCooldown.ToList())
+                        SvMan.StartCoroutine(KitCooldown(player.Key, obj, player.Value));
                 if (DebugLevel >= 1)
                     Debug.Log($"{SetTimeStamp.Run()}[INFO] Loaded kit: {obj.Name}");
             }
@@ -69,13 +69,13 @@ public static void StartKitTimer()
                 ErrorLogging.Run(ex);
             }
         }
-        public static IEnumerator KitCooldown(string username, Kits_Json.Kits_RootObj kit)
+        public static IEnumerator KitCooldown(string username, Kits_Json.Kits_RootObj kit, int PassedTime = 0)
         {
             if (!kit.CurrentlyInCooldown.ContainsKey(username))
                 kit.CurrentlyInCooldown.Add(username, kit.Delay);
             var path = Path.Combine(KitDirectory, $"{kit.Name}.json");
             File.WriteAllText(path, JsonConvert.SerializeObject(kit, Formatting.Indented));
-            var passedTime = 0;
+            var passedTime = PassedTime;
             while (passedTime <= kit.Delay)
             {
                 ++passedTime;
diff --git a/source/BP-Essentials/Methods/GameMethods/SendToJail.cs b/source/BP-Essentials/Methods/GameMethods/SendToJail.cs
@@ -20,7 +20,7 @@ public static bool Run(ShPlayer shPlayer, float time)
             shPlayer.StartCoroutine(shPlayer.svPlayer.JailTimer(time));
             shPlayer.svPlayer.SvClearCrimes();
             shPlayer.RemoveItemsJail();
-            shPlayer.svPlayer.Send(SvSendType.Self, Channel.Reliable, ClPacket.Timer, time);
+            shPlayer.svPlayer.Send(SvSendType.Self, Channel.Reliable, ClPacket.ShowTimer, time);
             return true;
         }
     }
diff --git a/source/BP-Essentials/Methods/misc/Reload.cs b/source/BP-Essentials/Methods/misc/Reload.cs
@@ -17,32 +17,25 @@ public static void Run(bool silentExecution, SvPlayer player = null, bool IsFirs
             {
                 if (!silentExecution)
                 {
-                    if (AdminsListPlayers.Contains(player.playerData.username))
-                    {
-                        player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, "[WAIT] Reloading all files..");
-                        CheckFiles.Run();
-                        ReadFile.Run(SettingsFile);
-                        ReadCustomCommands.Run();
-                        ReadGroups.Run();
-                        Kits.LoadAllKits();
-                        ReadStream.Run(LanguageBlockFile, LanguageBlockWords);
-                        ReadStream.Run(ChatBlockFile, ChatBlockWords);
-                        ReadStream.Run(AdminListFile, AdminsListPlayers);
-                        LanguageBlockWords = LanguageBlockWords.ConvertAll(d => d.ToLower());
-                        ChatBlockWords = ChatBlockWords.ConvertAll(d => d.ToLower());
-                        ReadFile.Run(IdListItemsFile);
-                        ReadFile.Run(IdListVehicleFile);
-                        ReadFile.Run(AnnouncementsFile);
-                        ReadFile.Run(GodListFile);
-                        ReadFile.Run(MuteListFile);
-                        ReadFile.Run(AfkListFile);
-                        ReadFile.Run(RulesFile);
-                        player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, "[OK] Critical .txt files reloaded");
-                    }
-                    else
-                    {
-                        player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, MsgNoPerm);
-                    }
+                    player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, "[WAIT] Reloading all files..");
+                    CheckFiles.Run();
+                    ReadFile.Run(SettingsFile);
+                    ReadCustomCommands.Run();
+                    ReadGroups.Run();
+                    Kits.LoadAllKits();
+                    ReadStream.Run(LanguageBlockFile, LanguageBlockWords);
+                    ReadStream.Run(ChatBlockFile, ChatBlockWords);
+                    ReadStream.Run(AdminListFile, AdminsListPlayers);
+                    LanguageBlockWords = LanguageBlockWords.ConvertAll(d => d.ToLower());
+                    ChatBlockWords = ChatBlockWords.ConvertAll(d => d.ToLower());
+                    ReadFile.Run(IdListItemsFile);
+                    ReadFile.Run(IdListVehicleFile);
+                    ReadFile.Run(AnnouncementsFile);
+                    ReadFile.Run(GodListFile);
+                    ReadFile.Run(MuteListFile);
+                    ReadFile.Run(AfkListFile);
+                    ReadFile.Run(RulesFile);
+                    player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, "[OK] Critical .txt files reloaded");
                 }
                 else
                 {

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,7 @@ class Reload : EssentialsChatPlugin`
`12`	`12`	`{`
`13`	`13`	`public static void Run(SvPlayer player)`
`14`	`14`	`{`
`15`		`- if (player.player.admin)`
`16`		`- BP_Essentials.Reload.Run(false, player);`
`17`		`- else`
`18`		`- player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, MsgNoPerm);`
	`15`	`+ BP_Essentials.Reload.Run(false, player);`
`19`	`16`	`}`
`20`	`17`	`}`
`21`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace BP_Essentials`
`7`	`7`	`{`
`8`	`8`	`public class EssentialsVariablesPlugin : EssentialsCorePlugin`
`9`	`9`	`{`
`10`		`- public const string Version = "2.5.4";`
	`10`	`+ public const string Version = "2.5.6";`
`11`	`11`	`public static bool isPreRelease;`
`12`	`12`
`13`	`13`	`// Generic Constants`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ public static void LoadAllKits(bool firstLoad = false)`
`26`	`26`	`continue;`
`27`	`27`	`}`
`28`	`28`	`listKits.Add(obj);`
`29`		`- if (firstLoad)`
`30`		`- foreach (var player in obj.CurrentlyInCooldown)`
`31`		`- SvMan.StartCoroutine(KitCooldown(player.Key, obj));`
	`29`	`+ if (firstLoad && obj.CurrentlyInCooldown != null)`
	`30`	`+ foreach (var player in obj.CurrentlyInCooldown.ToList())`
	`31`	`+ SvMan.StartCoroutine(KitCooldown(player.Key, obj, player.Value));`
`32`	`32`	`if (DebugLevel >= 1)`
`33`	`33`	`Debug.Log($"{SetTimeStamp.Run()}[INFO] Loaded kit: {obj.Name}");`
`34`	`34`	`}`
`@@ -69,13 +69,13 @@ public static void StartKitTimer()`
`69`	`69`	`ErrorLogging.Run(ex);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`		`- public static IEnumerator KitCooldown(string username, Kits_Json.Kits_RootObj kit)`
	`72`	`+ public static IEnumerator KitCooldown(string username, Kits_Json.Kits_RootObj kit, int PassedTime = 0)`
`73`	`73`	`{`
`74`	`74`	`if (!kit.CurrentlyInCooldown.ContainsKey(username))`
`75`	`75`	`kit.CurrentlyInCooldown.Add(username, kit.Delay);`
`76`	`76`	`var path = Path.Combine(KitDirectory, $"{kit.Name}.json");`
`77`	`77`	`File.WriteAllText(path, JsonConvert.SerializeObject(kit, Formatting.Indented));`
`78`		`- var passedTime = 0;`
	`78`	`+ var passedTime = PassedTime;`
`79`	`79`	`while (passedTime <= kit.Delay)`
`80`	`80`	`{`
`81`	`81`	`++passedTime;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static bool Run(ShPlayer shPlayer, float time)`
`20`	`20`	`shPlayer.StartCoroutine(shPlayer.svPlayer.JailTimer(time));`
`21`	`21`	`shPlayer.svPlayer.SvClearCrimes();`
`22`	`22`	`shPlayer.RemoveItemsJail();`
`23`		`- shPlayer.svPlayer.Send(SvSendType.Self, Channel.Reliable, ClPacket.Timer, time);`
	`23`	`+ shPlayer.svPlayer.Send(SvSendType.Self, Channel.Reliable, ClPacket.ShowTimer, time);`
`24`	`24`	`return true;`
`25`	`25`	`}`
`26`	`26`	`}`