Merge pull request #46 from HerrMagiic/dev

v2.0.1

Author: HerrMagiic

CustomCommands/Services/CooldownManager.cs

@@ -1,5 +1,6 @@
 using System.Text.Json;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CustomCommands.Model;
 using Microsoft.Extensions.Logging;
 
@@ -8,9 +9,11 @@ namespace CustomCommands.Interfaces;
 public class CooldownManager : ICooldownManager
 {
     public IPluginGlobals PluginGlobals { get; }
-    public CooldownManager(IPluginGlobals PluginGlobals)
+    public IReplaceTagsFunctions ReplaceTagsFunctions { get; }
+    public CooldownManager(IPluginGlobals PluginGlobals, IReplaceTagsFunctions ReplaceTagsFunctions)
     {
         this.PluginGlobals = PluginGlobals;
+        this.ReplaceTagsFunctions = ReplaceTagsFunctions;
     }
 
     /// <summary>
@@ -38,15 +41,25 @@ public bool IsCommandOnCooldownWithCondition(Func<CooldownTimer, bool> predicate
 
         if (index != -1)
         {
-            string timeleft = PluginGlobals.CooldownTimer[index].CooldownTime.Subtract(DateTime.Now).Seconds.ToString();
-            string message = "";
+            double totalSeconds = PluginGlobals.CooldownTimer[index].CooldownTime.Subtract(DateTime.Now).TotalSeconds;
+            int totalSecondsRounded = (int)Math.Round(totalSeconds);
+            string timeleft = totalSecondsRounded.ToString();
 
-            // Check if cmd.Cooldown is a Cooldown object
-            if (cmd.Cooldown is Cooldown cooldown)
-                message = cooldown.CooldownMessage.Replace("{TIME}", timeleft);
-            else
+            string message = "";
+            
+            // This is ugly as fuck
+            try
+            {
+                Cooldown cooldown = JsonSerializer.Deserialize<Cooldown>(cmd.Cooldown.GetRawText());
+                Console.WriteLine(cooldown.CooldownMessage);
+                string[] replaceTimeleft = {cooldown.CooldownMessage.Replace("{TIMELEFT}", timeleft)};
+                message = ReplaceTagsFunctions.ReplaceTags(replaceTimeleft, player)[0];
+            }
+            catch (JsonException)
+            {
                 message = $"This command is for {timeleft} seconds on cooldown";
-
+            }
+                
             player.PrintToChat($"{PluginGlobals.Config.Prefix}{message}");
 
             return true;
@@ -69,10 +82,9 @@ public void AddToCooldownList(bool isGlobal, int playerID, Guid commandID, int c
             CommandID = commandID, 
             CooldownTime = DateTime.Now.AddSeconds(cooldownTime)
         };
-        Console.WriteLine("Cooldown 2");
+
         if (isGlobal)
         {
-            Console.WriteLine("Cooldown 3");
             int index = PluginGlobals.CooldownTimer.FindIndex(x => 
                 x.IsGlobal == true 
                 && x.CommandID == commandID);

CustomCommands/Services/EventManager.cs

@@ -52,7 +52,7 @@ public void RegisterListeners()
             {
                 Utilities.GetPlayers().ForEach(controller =>
                 {
-                    if (controller == null || !controller.IsValid) return;
+                    if (!controller.IsValid || controller.SteamID == 0) return;
 
                     string message = ReplaceTagsFunctions.ReplaceLanguageTags(PluginGlobals.centerServerOn.Message);
                     message = ReplaceTagsFunctions.ReplaceMessageTags(message, controller);