feat: improve getplayers & RemoveItemByDesignerName (#1044)

Author: schwarper

managed/CounterStrikeSharp.API/Modules/Extensions/CBasePlayerWeaponExtensions.cs

@@ -0,0 +1,38 @@
+using CounterStrikeSharp.API.Modules.Entities;
+
+namespace CounterStrikeSharp.API.Modules.Extensions;
+
+public static class CBasePlayerWeaponExtensions
+{
+    /// <summary>
+    /// Gets the weapon's designer name (e.g., "weapon_ak47").
+    /// </summary>
+    /// <param name="weapon">The <see cref="CBasePlayerWeapon"/> instance.</param>
+    /// <returns>The designer name of the weapon as a string, or <c>null</c> if it cannot be retrieved.</returns>
+    public static string? GetWeaponName(this CBasePlayerWeapon weapon)
+    {
+        return weapon.GetVData<CCSWeaponBaseVData>()?.Name;
+    }
+
+    /// <summary>
+    /// Gets the econ owner of a weapon entity
+    /// </summary>
+    /// <param name="weapon">The weapon entity.</param>
+    /// <returns>The <see cref="CCSPlayerController"/> instance for the player, or <c>null</c> if it doesn't exist.</returns>
+    public static CCSPlayerController? GetEconOwner(this CBasePlayerWeapon weapon)
+    {
+        ulong originalXuid = weapon.OriginalOwnerXuidLow;
+        SteamID? steamId = originalXuid > 0 ? new(originalXuid) : null;
+
+        CCSPlayerController? player = null;
+
+        if (steamId?.IsValid() == true)
+            player = Utilities.GetPlayers().FirstOrDefault(p =>
+                p.SteamID == steamId.SteamId64 || p.SteamID == originalXuid);
+
+        if (player == null)
+            player = weapon.OwnerEntity.Get()?.As<CCSPlayerController>();
+
+        return player?.Connected == PlayerConnectedState.PlayerConnected ? player : null;
+    }
+}

managed/CounterStrikeSharp.API/Server.cs

@@ -142,7 +142,17 @@ public static void PrintToChatAll(string message)
 
         public static string GameDirectory => NativeAPI.GetGameDirectory();
 
-        public static int MaxPlayers => NativeAPI.GetMaxClients();
+        private static int? _maxPlayers;
+
+        public static int MaxPlayers
+        {
+            get
+            {
+                _maxPlayers ??= NativeAPI.GetMaxClients();
+
+                return _maxPlayers.Value;
+            }
+        }
 
         public static bool IsMapValid(string mapName) => NativeAPI.IsMapValid(mapName);
 

managed/CounterStrikeSharp.API/Utilities.cs

@@ -16,12 +16,9 @@
 
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Utils;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
-using CounterStrikeSharp.API.Core.Logging;
 using CounterStrikeSharp.API.Modules.Commands.Targeting;
 using CounterStrikeSharp.API.Modules.Entities;
 using Microsoft.Extensions.Logging;
@@ -60,13 +57,13 @@ public static IEnumerable<T> FlagsToList<T>(this T flags) where T : Enum
 
         public static CCSPlayerController? GetPlayerFromIndex(int index)
         {
-            var player = GetEntityFromIndex<CCSPlayerController>(index);
-            if (player == null || player.DesignerName != "cs_player_controller")
+            var entityPtr = EntitySystem.GetEntityByIndex((uint)index);
+            if (entityPtr is null || entityPtr == IntPtr.Zero)
             {
                 return null;
             }
 
-            return player;
+            return new CCSPlayerController(entityPtr.Value);
         }
 
         public static CCSPlayerController? GetPlayerFromSlot(int slot)
@@ -81,47 +78,50 @@ public static IEnumerable<T> FlagsToList<T>(this T flags) where T : Enum
 
         public static CCSPlayerController? GetPlayerFromSteamId(ulong steamId)
         {
-            return Utilities.GetPlayers().FirstOrDefault(player => player.AuthorizedSteamID == (SteamID)steamId);
+            return GetPlayers().FirstOrDefault(player => player.AuthorizedSteamID == (SteamID)steamId);
         }
 
-        public static TargetResult ProcessTargetString(string pattern, CCSPlayerController player)
+        public static CCSPlayerController? GetPlayerFromSteamId64(ulong steamId)
         {
-            return new Target(pattern).GetTarget(player);
+            return GetPlayers().FirstOrDefault(player => player.SteamID == steamId);
         }
 
-        public static bool RemoveItemByDesignerName(this CCSPlayerController player, string designerName)
+        public static TargetResult ProcessTargetString(string pattern, CCSPlayerController player)
         {
-            return RemoveItemByDesignerName(player, designerName, false);
+            return new Target(pattern).GetTarget(player);
         }
 
-        public static bool RemoveItemByDesignerName(this CCSPlayerController player, string designerName, bool shouldRemoveEntity)
+        public static bool RemoveItemByDesignerName(this CCSPlayerController player, string designerName)
         {
-            CHandle<CBasePlayerWeapon>? item = null;
-            if (player.PlayerPawn.Value == null || player.PlayerPawn.Value.WeaponServices == null) return false;
+            var weapon = player.PlayerPawn.Value?.WeaponServices?.MyWeapons
+                .Select(w => w.Value)
+                .Where(w => w?.IsValid is true && w.DesignerName == designerName)
+                .FirstOrDefault();
 
-            foreach (var weapon in player.PlayerPawn.Value.WeaponServices.MyWeapons)
-            {
-                if (weapon is not { IsValid: true, Value.IsValid: true })
-                    continue;
-                if (weapon.Value.DesignerName != designerName)
-                    continue;
+            if (weapon == null)
+                return false;
 
-                item = weapon;
-            }
+            weapon.AddEntityIOEvent("Kill", weapon, delay: 0.1f);
+            return true;
+        }
 
-            if (item != null && item.Value != null)
-            {
-                player.PlayerPawn.Value.RemovePlayerItem(item.Value);
+        public static bool RemoveItemByDesignerName(this CCSPlayerController player, string designerName, bool _)
+        {
+            return RemoveItemByDesignerName(player, designerName);
+        }
 
-                if (shouldRemoveEntity)
-                {
-                    item.Value.Remove();
-                }
+        public static bool RemoveItemBySlot(this CCSPlayerController player, gear_slot_t slot)
+        {
+            var weapon = player.PlayerPawn.Value?.WeaponServices?.MyWeapons
+                .Select(w => w.Value)
+                .Where(w => w?.As<CCSWeaponBase>().VData?.GearSlot == slot)
+                .FirstOrDefault();
 
-                return true;
-            }
+            if (weapon == null)
+                return false;
 
-            return false;
+            weapon.AddEntityIOEvent("Kill", weapon, delay: 0.1f);
+            return true;
         }
 
         public static IEnumerable<T> FindAllEntitiesByDesignerName<T>(string designerName) where T : CEntityInstance