Fix infinite kits bug IMPORTANT UPDATE!

Author: RestoreMonarchy

Kits/Commands/KitCommand.cs

@@ -62,7 +62,7 @@ public void Execute(IRocketPlayer caller, string[] command)
                     }
                 }
 
-                cooldown = pluginInstance.Cooldowns.Find(x => x.SteamId == caller.Id && x.KitName.Equals(kit.Name, StringComparison.OrdinalIgnoreCase));
+                cooldown = pluginInstance.GetCooldown(caller.Id, kitName);
                 if (cooldown != null && cooldown.EndDate > DateTime.Now)
                 {
                     TimeSpan timeSpan = cooldown.EndDate - DateTime.Now;

Kits/Commands/KitsCommand.cs

@@ -36,7 +36,7 @@ public void Execute(IRocketPlayer caller, string[] command)
             {
                 string kitName = pluginInstance.Translate("KitNameFormat", kit.Name);
                 string kitPrice = kit.Price > 0 ? pluginInstance.Translate("KitPriceFormat", kit.Price) : "";
-                KitCooldown cooldown = pluginInstance.Cooldowns.Find(x => x.SteamId == caller.Id && x.KitName.Equals(kit.Name, System.StringComparison.OrdinalIgnoreCase));
+                KitCooldown cooldown = pluginInstance.GetCooldown(caller.Id, kit.Name);
                 string kitCooldown = "";
                 if (cooldown != null && !hasKitAdmin && cooldown.EndDate > DateTime.Now)
                 {

Kits/Kits.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net48</TargetFramework>
 	<LangVersion>latest</LangVersion>
 	<RootNamespace>RestoreMonarchy.Kits</RootNamespace>
-    <Version>1.0.3</Version>
+    <Version>1.0.5</Version>
   </PropertyGroup>
 
   <ItemGroup>

Kits/KitsPlugin.cs

@@ -92,14 +92,21 @@ protected override void Unload()
             { "KitAdminBypassPermission", "You have bypassed kit cooldown, because you are admin or have kits.admin permission." }
         };
 
+        public KitCooldown GetCooldown(string steamId, string kitName)
+        {
+            Cooldowns.RemoveAll(x => x.EndDate < DateTime.Now);
+
+            return Cooldowns.Find(x => x.SteamId == steamId && x.KitName.Equals(kitName, StringComparison.OrdinalIgnoreCase));
+        }
+
         private void OnPostSave()
         {
             KitCooldownsDatabase.Save();
         }
 
         public string FormatTimespan(TimeSpan span)
         {
-            if (span <= TimeSpan.Zero) return Translate("Zero");
+            if (span < TimeSpan.FromSeconds(1)) return Translate("Zero");
 
             List<string> items = new();
             if (span.Days > 0)