Merge 2f08f01 into 09561da

Author: HerrMagiic

CustomCommands/CustomCommands.cs

@@ -9,7 +9,7 @@ namespace CustomCommands;
 public partial class CustomCommands : BasePlugin, IPluginConfig<CustomCommandsConfig>
 {
     public override string ModuleName => "CustomCommands";
-    public override string ModuleVersion => "2.0.0";
+    public override string ModuleVersion => "2.0.2";
     public override string ModuleAuthor => "HerrMagic";
     public override string ModuleDescription => "Create your own commands per config";
 

CustomCommands/Interfaces/IReplaceTagsFunctions.cs

@@ -6,7 +6,7 @@ public interface IReplaceTagsFunctions
 {
     string[] ReplaceTags(string[] input, CCSPlayerController player);
     string ReplaceLanguageTags(string input);
-    string ReplaceMessageTags(string input, CCSPlayerController player);
+    string ReplaceMessageTags(string input, CCSPlayerController player, bool safety = true);
     string ReplaceColorTags(string input);
     string[] WrappedLine(dynamic message);
 }

CustomCommands/Services/ReplaceTagsFunction.cs

@@ -31,7 +31,7 @@ public string[] ReplaceTags(string[] input, CCSPlayerController player)
         for (int i = 0; i < input.Length; i++)
         {
             output[i] = ReplaceLanguageTags(input[i]);
-            output[i] = ReplaceMessageTags(output[i], player);
+            output[i] = ReplaceMessageTags(output[i], player, false);
             output[i] = ReplaceColorTags(output[i]);
         }
 
@@ -61,7 +61,7 @@ public string ReplaceLanguageTags(string input)
             return input;
         }
     }
-    public string ReplaceMessageTags(string input, CCSPlayerController player)
+    public string ReplaceMessageTags(string input, CCSPlayerController player, bool safety = true)
     {
         SteamID steamId = new SteamID(player.SteamID);
 
@@ -71,7 +71,6 @@ public string ReplaceMessageTags(string input, CCSPlayerController player)
             {"{MAP}", NativeAPI.GetMapName() ?? "<MAP not found>"},
             {"{TIME}", DateTime.Now.ToString("HH:mm:ss") ?? "<TIME not found>"},
             {"{DATE}", DateTime.Now.ToString("dd.MM.yyyy") ?? "<DATE not found>"},
-            {"{PLAYERNAME}", player.PlayerName ?? "<PLAYERNAME not found>"},
             {"{USERID}", player.Slot.ToString() ?? "<USERID not found>"},
             {"{STEAMID2}", steamId.SteamId2 ?? "<STEAMID2 not found>"},
             {"{STEAMID3}", steamId.SteamId3 ?? "<STEAMID3 not found>"},
@@ -84,6 +83,8 @@ public string ReplaceMessageTags(string input, CCSPlayerController player)
             {"{PLAYERS}",
                 Utilities.GetPlayers().Count(u => u.PlayerPawn.Value != null && u.PlayerPawn.Value.IsValid).ToString() ?? "<PLAYERS not found>"}
         };
+        if (!safety)
+            replacements.Add("{PLAYERNAME}", player.PlayerName ?? "<PLAYERNAME not found>");
 
         foreach (var pair in replacements)
             input = input.Replace(pair.Key, pair.Value);

Examples/ServerCommands.json

@@ -31,7 +31,7 @@
             "cl_ragdoll_gravity 0",
             "sv_accelerate 10",
             "sv_airaccelerate 1400",
-            "sv_gravity 800.0"
+            "sv_gravity 800.0" 
         ],
         "Permission": {
             "RequiresPermissionOr": true,