V1.1.2

1Mack · May 12, 2024 · fa7f3cd · fa7f3cd
1 parent 563838b
commit fa7f3cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CallAdmin.cs b/CallAdmin.cs
@@ -68,10 +68,8 @@ private HookResult OnPlayerChat(CCSPlayerController? player, CommandInfo info)
   {
     if (player == null || !player.IsValid || player.IsBot) return HookResult.Continue;
     var findPlayer = CustomMessagePlayers.Find(obj => obj.Player == (int)player.Index);
-
     if (findPlayer == null || !findPlayer.HandleMessage || findPlayer.Target == null ||
-    info.GetArg(1).StartsWith('!') || info.GetArg(1).StartsWith('/') || info.GetArg(1) == "rtv") return HookResult.Continue;
-
+    info.GetArg(1).StartsWith('!') || info.GetArg(1).StartsWith('/') || Array.Exists(Config.ReasonsToIgnore, element => element == info.GetArg(1))) return HookResult.Continue;
     var findTarget = Utilities.GetPlayerFromIndex((int)findPlayer.Target);
 
     HandleSentToDiscordAsync(player, findTarget!, info.ArgString.Replace("\"", ""));

diff --git a/Commands/Report.cs b/Commands/Report.cs
@@ -18,7 +18,10 @@ public void ReportCommand(CCSPlayerController? player, CommandInfo command)
     }
     if (CanExecuteCommand(player.Slot))
     {
-      var getPlayers = Utilities.GetPlayers().Where(p => p != null && !p.IsBot && !p.IsHLTV && p.AuthorizedSteamID != null && !Config.Debug ? p.Index != player.Index : true);
+      var getPlayers = Utilities.GetPlayers()
+      .Where(p => p.IsValid && p.AuthorizedSteamID != null && !Config.Debug ? p.Index != player!.Index : true)
+      .Where(p => !p.IsBot && !p.IsHLTV)
+      .Where(p => Config.Commands.ReportFlagsToIgnore.Length == 0 || !AdminManager.PlayerHasPermissions(p, Config.Commands.ReportFlagsToIgnore));
 
       if (!getPlayers.Any())
       {

diff --git a/Config.cs b/Config.cs
@@ -73,6 +73,8 @@ public class Commands
   public string[] ReportPrefix { get; set; } = ["report", "calladmin"];
   [JsonPropertyName("ReportPermission")]
   public string[] ReportPermission { get; set; } = [];
+  [JsonPropertyName("ReportFlagsToIgnore")]
+  public string[] ReportFlagsToIgnore { get; set; } = [];
   [JsonPropertyName("ReportHandledEnabled")]
   public bool ReportHandledEnabled { get; set; } = true;
   [JsonPropertyName("ReportHandledPrefix")]