Merge pull request #6 from schwarper/PlayerGagSystem

Added player gag system
schwarper · Jun 11, 2024 · 325fb36 · 325fb36
2 parents bdc6f86 + 18e4ed9
commit 325fb36
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/TagsApi/ITagsApi.cs b/TagsApi/ITagsApi.cs
@@ -8,6 +8,8 @@ public interface ITagApi
 {
     public static readonly PluginCapability<ITagApi?> Capability = new("tags:api");
 
+    public void GagPlayer(ulong steamID);
+    public void UngagPlayer(ulong steamID);
     public string GetPlayerTag(CCSPlayerController player, Tags_Tags tag);
     public void SetPlayerTag(CCSPlayerController player, Tags_Tags tag, string newtag);
     public void ResetPlayerTag(CCSPlayerController player, Tags_Tags tag);

diff --git a/TagsApi/TagsApi.cs b/TagsApi/TagsApi.cs
@@ -1,4 +1,6 @@
-namespace TagsApi;
+using CounterStrikeSharp.API.Core;
+
+namespace TagsApi;
 
 public abstract class Tags
 {

diff --git a/cs2-tags/src/api/api.cs b/cs2-tags/src/api/api.cs
@@ -11,6 +11,16 @@ public TagsAPI()
     {
     }
 
+    public void GagPlayer(ulong steamID)
+    {
+        PlayerGagList.Add(steamID);
+    }
+
+    public void UngagPlayer(ulong steamID)
+    {
+        PlayerGagList.Remove(steamID);
+    }
+
     public string GetPlayerTag(CCSPlayerController player, Tags_Tags tag)
     {
         if (Instance.PlayerTagDatas.TryGetValue(player.Slot, out Tag? playerTag) && playerTag != null)

diff --git a/cs2-tags/src/cs2-tag.cs b/cs2-tags/src/cs2-tag.cs
@@ -10,14 +10,15 @@ namespace Tags;
 public partial class Tags : BasePlugin, IPluginConfig<TagsConfig>
 {
     public override string ModuleName => "Tag";
-    public override string ModuleVersion => "0.0.3";
+    public override string ModuleVersion => "0.0.4";
     public override string ModuleAuthor => "schwarper";
 
     public TagsConfig Config { get; set; } = new TagsConfig();
     public Dictionary<int, Tag> PlayerTagDatas { get; set; } = [];
     public Dictionary<int, bool> PlayerToggleTags { get; set; } = [];
     public static Tags Instance { get; set; } = new Tags();
     public int GlobalTick { get; set; }
+    public static HashSet<ulong> PlayerGagList { get; set; } = [];
 
     public override void Load(bool hotReload)
     {

diff --git a/cs2-tags/src/event/event.cs b/cs2-tags/src/event/event.cs
@@ -4,6 +4,7 @@
 using CounterStrikeSharp.API.Modules.Utils;
 using static CounterStrikeSharp.API.Core.Listeners;
 using static Tags.Tags;
+using static Tags.TagsAPI;
 using static TagsApi.Tags;
 
 namespace Tags;
@@ -66,30 +67,30 @@ public static HookResult OnPlayerChat(CCSPlayerController? player, CommandInfo i
             return HookResult.Continue;
         }
 
-        if (!Instance.PlayerTagDatas.TryGetValue(player.Slot, out Tag? playerData) || playerData == null)
+        string command = info.GetArg(1);
+
+        if (CoreConfig.SilentChatTrigger.Any(i => command.StartsWith(i)))
         {
             return HookResult.Continue;
         }
 
-        string command = info.GetArg(1);
+        if (PlayerGagList.Contains(player.SteamID))
+        {
+            return HookResult.Handled;
+        }
 
         if (CoreConfig.PublicChatTrigger.Any(i => command.StartsWith(i)))
         {
-            /* TO DO
-             * Try to find something else, for now ignore it.
-            player.ExecuteClientCommandFromServer($"css_{command[1..]}");
-            */
-
             return HookResult.Continue;
         }
 
-        if (CoreConfig.SilentChatTrigger.Any(i => command.StartsWith(i)))
+        if (!Instance.PlayerTagDatas.TryGetValue(player.Slot, out Tag? playerData) || playerData == null)
         {
-            return HookResult.Handled;
+            return HookResult.Continue;
         }
 
-        string deadname = player.PawnIsAlive ? string.Empty : Instance.Config.Settings["deadname"];
         bool teammessage = info.GetArg(0) == "say_team";
+        string deadname = player.PawnIsAlive ? string.Empty : Instance.Config.Settings["deadname"];
         string tag = playerData.ChatTag;
         string namecolor = playerData.NameColor;
         string chatcolor = playerData.ChatColor;