Added tag support for server commands

Author: NilsSchucka

CustomCommands/Interfaces/IPluginUtilities.cs

@@ -7,6 +7,6 @@ namespace CustomCommands.Interfaces;
 public interface IPluginUtilities
 {
     string[] SplitStringByCommaOrSemicolon(string str);
-    void ExecuteServerCommands(Commands cmd);
+    void ExecuteServerCommands(Commands cmd, CCSPlayerController player);
     bool RequiresPermissions(CCSPlayerController player, Permission permissions);
 }

CustomCommands/Services/PluginUtilities.cs

@@ -10,10 +10,12 @@ namespace CustomCommands.Services;
 public class PluginUtilities : IPluginUtilities
 {
     private readonly IPluginGlobals PluginGlobals;
+    private readonly IReplaceTagsFunctions ReplaceTagsFunctions;
 
-    public PluginUtilities(IPluginGlobals PluginGlobals)
+    public PluginUtilities(IPluginGlobals PluginGlobals, IReplaceTagsFunctions ReplaceTagsFunctions)
     {
         this.PluginGlobals = PluginGlobals;
+        this.ReplaceTagsFunctions = ReplaceTagsFunctions;
     }
 
     public string[] SplitStringByCommaOrSemicolon(string str)
@@ -23,13 +25,13 @@ public string[] SplitStringByCommaOrSemicolon(string str)
                         .ToArray();
     }
 
-    public void ExecuteServerCommands(Commands cmd) 
+    public void ExecuteServerCommands(Commands cmd, CCSPlayerController player) 
     {
         if (cmd.ServerCommands.Count == 0) return;
 
         foreach (var serverCommand in cmd.ServerCommands)
         {
-            Server.ExecuteCommand(serverCommand);
+            Server.ExecuteCommand(ReplaceTagsFunctions.ReplaceMessageTags(serverCommand, player));
         }
     }
     public bool RequiresPermissions(CCSPlayerController player, Permission permissions)

CustomCommands/Services/RegisterCommands.cs

@@ -41,7 +41,7 @@ public void AddCommands(Commands com)
 
                 MessageManager.SendMessage(player, com);
 
-                PluginUtilities.ExecuteServerCommands(com);
+                PluginUtilities.ExecuteServerCommands(com, player);
             });
         }
     }

Examples/ServerCommands.json

@@ -40,5 +40,15 @@
                 "@customcommands/surf"
             ]
         }
+    },
+    {
+        "Title": "Kickme",
+        "Description": "command that kicks yourself",
+        "Command": "kickme",
+        "Message": "Getting Kicket",
+        "PrintTo": 0,
+        "ServerCommands": [
+            "kick {PLAYERNAME}" // Tags work for commands as well
+        ]
     }
 ]