v1.1.6

feat: players with admin flag are not shown in the list of names or counted in case they are in the spectator team or none (to be compatible with /hide command of simpleadmin); you can enable or disable this logic by setting `DontCountAdmins` to false

Author: wiruwiru

Config.cs

@@ -41,6 +41,12 @@ public class BaseConfigs : BasePluginConfig
     [JsonPropertyName("CommandCooldownSeconds")]
     public int CommandCooldownSeconds { get; set; } = 120;
 
+    [JsonPropertyName("DontCountAdmins")]
+    public bool DontCountAdmins { get; set; } = false;
+
+    [JsonPropertyName("AdminBypassFlag")]
+    public string AdminBypassFlag { get; set; } = "@css/generic";
+
     [JsonPropertyName("Command")]
     public List<string> Command { get; set; } = new List<string> { "css_need", ".need" };
 

NeedSystem.cs

@@ -6,6 +6,8 @@
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Cvars;
 using CounterStrikeSharp.API.Core.Attributes;
+using CounterStrikeSharp.API.Modules.Utils;
+using CounterStrikeSharp.API.Modules.Admin;
 
 namespace NeedSystem;
 
@@ -17,7 +19,7 @@ public class NeedSystemBase : BasePlugin, IPluginConfig<BaseConfigs>
     private Translator _translator;
 
     public override string ModuleName => "NeedSystem";
-    public override string ModuleVersion => "1.1.5";
+    public override string ModuleVersion => "1.1.6";
     public override string ModuleAuthor => "luca.uy";
     public override string ModuleDescription => "Allows players to send a message to discord requesting players.";
 
@@ -146,7 +148,25 @@ private bool CheckCommandCooldown(out int secondsRemaining)
     public int GetNumberOfPlayers()
     {
         var players = Utilities.GetPlayers();
-        return players.Count(p => !p.IsBot && !p.IsHLTV);
+        return players.Where(p => !p.IsBot && !p.IsHLTV && ShouldShowPlayerInList(p)).Count();
+    }
+
+    private bool ShouldShowPlayerInList(CCSPlayerController player)
+    {
+        if (!Config.DontCountAdmins || string.IsNullOrEmpty(Config.AdminBypassFlag))
+            return true;
+
+        try
+        {
+            if (!AdminManager.PlayerHasPermissions(player, Config.AdminBypassFlag))
+                return true;
+
+            return player.Team == CsTeam.Terrorist || player.Team == CsTeam.CounterTerrorist;
+        }
+        catch
+        {
+            return true;
+        }
     }
 
     private int ConvertHexToColor(string hex)
@@ -172,6 +192,7 @@ public void NeedCommand(CCSPlayerController? caller, string clientName)
         {
             var players = Utilities.GetPlayers()
                 .Where(p => !p.IsBot && !p.IsHLTV && p.Connected == PlayerConnectedState.PlayerConnected)
+                .Where(ShouldShowPlayerInList)
                 .Select(p => new { p.PlayerName, p.SteamID })
                 .ToList();
 
@@ -294,7 +315,7 @@ private async Task SendEmbedToDiscord(object embed)
 
             var payload = new
             {
-                content = content,
+                content,
                 embeds = new[] { embed }
             };