Adapted the plugin to use the player index instead of the controller

Ravid-A · Ravid-A · commit d1ceab739a54 · 2024-01-29T00:00:40.000+02:00
diff --git a/Modules/Core.cs b/Modules/Core.cs
@@ -40,10 +40,7 @@ public override void Load(bool hotReload)
 
         if (hotReload)
         {
-            Utilities.GetPlayers().ForEach(player =>
-            {
-                AddPlayerToList(player, player.AuthorizedSteamID!);
-            });
+            Utilities.GetPlayers().ForEach(AddPlayerToList);
         }
     }
 
diff --git a/Modules/Handlers/Listeners.cs b/Modules/Handlers/Listeners.cs
@@ -16,7 +16,6 @@ public static void RegisterListeners()
     {
         Plugin.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(OnMapStart);
         Plugin.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnClientAuthorized>(OnClientAuthorized);
-        Plugin.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnClientConnected>(OnClientConnected);
         Plugin.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnClientDisconnect>(OnClientDisconnect);
 
         Plugin.AddCommandListener("say", OnSay);
@@ -26,28 +25,13 @@ public static void RegisterListeners()
     private static void OnMapStart(string map_name)
     {
         Players.Clear();
-        Utilities.GetPlayers().ForEach(player =>
-        {
-            AddPlayerToList(player, player.AuthorizedSteamID!);
-        });
+        Utilities.GetPlayers().ForEach(AddPlayerToList);
     }
 
-    private static void OnClientAuthorized(int playerSlot, [CastFrom(typeof(ulong))] SteamID steamId)
+    private static void OnClientAuthorized(int playerSlot, SteamID steamID)
     {
-        if (steamId.SteamId2 == string.Empty)
-        {
-            ServerCommand($"kickid {playerSlot} \"SteamID2 not found.\"");
-            return;
-        }
-
-        var player = Utilities.GetPlayerFromSlot(playerSlot);
-        AddPlayerToList(player, steamId);
-    }
-
-    private static void OnClientConnected(int playerSlot)
-    {
-        var player = Utilities.GetPlayerFromSlot(playerSlot);
-        AddPlayerToList(player, player.AuthorizedSteamID!);
+        CCSPlayerController player = Utilities.GetPlayerFromSlot(playerSlot);
+        AddPlayerToList(player);
     }
 
     private static void OnClientDisconnect(int playerSlot)
diff --git a/Modules/Models/Player.cs b/Modules/Models/Player.cs
@@ -1,25 +1,25 @@
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities;
 using CounterStrikeSharp.API.Modules.Utils;
 using RetakesAllocator.Modules.Weapons;
 
 using static RetakesAllocator.Modules.Core;
+using static RetakesAllocator.Modules.Utils;
 
 namespace RetakesAllocator.Modules.Models;
 
 public class Player
 {
-    public CCSPlayerController player;
-
-    private SteamID _steamId;
+    public int playerIndex;
+    public CCSPlayerController player => Utilities.GetPlayerFromIndex(playerIndex);
 
     public readonly Allocator WeaponsAllocator;
 
-    public Player(CCSPlayerController player, SteamID steamId)
+    public Player(CCSPlayerController player)
     {
-        this.player = player;
-        _steamId = steamId;
-        WeaponsAllocator = new Allocator(player);
+        playerIndex = (int)player.Index;
+        WeaponsAllocator = new Allocator(this);
     }
 
     public static void SetupPlayers(List<Player> players)
@@ -69,7 +69,7 @@ private CsTeam GetTeam()
 
     public string GetSteamId2()
     {
-        return _steamId.SteamId2;
+        return player.AuthorizedSteamID!.SteamId2;
     }
 
     public string GetName()
diff --git a/Modules/Utils.cs b/Modules/Utils.cs
@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
-using CounterStrikeSharp.API.Modules.Entities;
 using static RetakesAllocator.Modules.Core;
 using static RetakesAllocator.Modules.Database;
 using Player = RetakesAllocator.Modules.Models.Player;
@@ -37,27 +36,19 @@ public static void ReplyToCommand(CommandInfo commandInfo, string msg)
         commandInfo.ReplyToCommand(msg);
     }
 
-    public static Player FindPlayer(CCSPlayerController player)
+    public static Player FindPlayer(CCSPlayerController cCSPlayerController)
     {
-        foreach(var playerObj in Players)
-        {
-            if (playerObj.player == player)
-            {
-                return playerObj;
-            }
-        }
-
-        return null!;
+        return Players.Find(player => player.playerIndex == cCSPlayerController.Index)!;
     }
 
     public static void ServerCommand(string command, params object[] args)
     {
         Server.ExecuteCommand(string.Format(command, args));
     }
 
-    public static void AddPlayerToList(CCSPlayerController player, SteamID steamId)
+    public static void AddPlayerToList(CCSPlayerController player)
     {
-        if (player == null || !player.IsValid || player.IsBot || steamId is null)
+        if (player == null || !player.IsValid || player.IsBot)
         {
             return;
         }
@@ -67,7 +58,7 @@ public static void AddPlayerToList(CCSPlayerController player, SteamID steamId)
             return;
         }
 
-        var playerObj = new Player(player, steamId);
+        var playerObj = new Player(player);
 
         Players.Add(playerObj);
 
diff --git a/Modules/Weapons/Allocator.cs b/Modules/Weapons/Allocator.cs
@@ -1,6 +1,7 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
+using RetakesAllocator.Modules.Models;
 
 namespace RetakesAllocator.Modules.Weapons;
 
@@ -55,7 +56,9 @@ public enum WeaponType
         new("weapon_deagle", "Desert Eagle")
     };
 
-    private readonly CCSPlayerController _player;
+    private readonly Player _player;
+
+    private CCSPlayerController cCSPlayerController => _player.player;
 
     public int PrimaryWeaponT = 0;
     public int PrimaryWeaponCt = 0;
@@ -64,7 +67,7 @@ public enum WeaponType
     public GiveAwp GiveAwp = GiveAwp.Never;
     public bool ShouldGiveAwp = false;
 
-    public Allocator(CCSPlayerController player)
+    public Allocator(Player player)
     {
         _player = player;
     }
@@ -98,17 +101,17 @@ public bool SetupGiveAwp()
 
     public void Allocate()
     {
-        if (_player == null || !_player.IsValid)
+        if (_player == null || cCSPlayerController == null || !_player.player.IsValid)
         {
             return;
         }
 
-        if (!_player.PawnIsAlive)
+        if (!cCSPlayerController.PawnIsAlive)
         {
             return;
         }
 
-        if ((CsTeam)_player.TeamNum < CsTeam.Terrorist || (CsTeam)_player.TeamNum > CsTeam.CounterTerrorist)
+        if ((CsTeam)cCSPlayerController.TeamNum < CsTeam.Terrorist || (CsTeam)cCSPlayerController.TeamNum > CsTeam.CounterTerrorist)
         {
             return;
         }
@@ -120,7 +123,7 @@ public void Allocate()
         }
         else
         {
-            if ((CsTeam)_player.TeamNum == CsTeam.Terrorist)
+            if ((CsTeam)cCSPlayerController.TeamNum == CsTeam.Terrorist)
             {
                 primary = PrimaryT[PrimaryWeaponT].Item;
             }
@@ -132,14 +135,14 @@ public void Allocate()
 
         string secondary = Pistols[SecondaryWeapon].Item;
 
-        _player.GiveNamedItem(primary);
-        _player.GiveNamedItem(secondary);
-        _player.GiveNamedItem(CsItem.Knife);
+        cCSPlayerController.GiveNamedItem(primary);
+        cCSPlayerController.GiveNamedItem(secondary);
+        cCSPlayerController.GiveNamedItem(CsItem.Knife);
 
         CsItem grenade = SelectGrenade();
-        _player.GiveNamedItem(grenade);
+        cCSPlayerController.GiveNamedItem(grenade);
 
-        if (_player.TeamNum == (byte)CsTeam.CounterTerrorist)
+        if (cCSPlayerController.TeamNum == (byte)CsTeam.CounterTerrorist)
         {
            GiveCtEquipment();
         }
@@ -166,7 +169,7 @@ private CsItem SelectGrenade()
                 grenade = CsItem.SmokeGrenade;
                 break;
             case 3:
-                grenade = (CsTeam)_player.TeamNum == CsTeam.Terrorist ? CsItem.Molotov : CsItem.Incendiary;
+                grenade = (CsTeam)cCSPlayerController.TeamNum == CsTeam.Terrorist ? CsItem.Molotov : CsItem.Incendiary;
                 break;
         }
 
@@ -175,16 +178,16 @@ private CsItem SelectGrenade()
 
     private void GiveCtEquipment()
     {
-        _player.GiveNamedItem(CsItem.KevlarHelmet); 
+        cCSPlayerController.GiveNamedItem(CsItem.KevlarHelmet); 
 
         if (
-            (CsTeam)_player.TeamNum == CsTeam.CounterTerrorist
-            && _player.PlayerPawn.IsValid
-            && _player.PlayerPawn.Value != null
-            && _player.PlayerPawn.Value.IsValid
-            && _player.PlayerPawn.Value.ItemServices != null
+            (CsTeam)cCSPlayerController.TeamNum == CsTeam.CounterTerrorist
+            && cCSPlayerController.PlayerPawn.IsValid
+            && cCSPlayerController.PlayerPawn.Value != null
+            && cCSPlayerController.PlayerPawn.Value.IsValid
+            && cCSPlayerController.PlayerPawn.Value.ItemServices != null
         ) {
-            var itemServices = new CCSPlayer_ItemServices(_player.PlayerPawn.Value.ItemServices.Handle)
+            var itemServices = new CCSPlayer_ItemServices(cCSPlayerController.PlayerPawn.Value.ItemServices.Handle)
             {
                 HasDefuser = true
             };
@@ -193,6 +196,6 @@ private void GiveCtEquipment()
 
     private void GiveArmor()
     {
-        _player.GiveNamedItem(CsItem.KevlarHelmet); 
+        cCSPlayerController.GiveNamedItem(CsItem.KevlarHelmet); 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@ public override void Load(bool hotReload)`
`40`	`40`
`41`	`41`	`if (hotReload)`
`42`	`42`	`{`
`43`		`- Utilities.GetPlayers().ForEach(player =>`
`44`		`- {`
`45`		`- AddPlayerToList(player, player.AuthorizedSteamID!);`
`46`		`- });`
	`43`	`+ Utilities.GetPlayers().ForEach(AddPlayerToList);`
`47`	`44`	`}`
`48`	`45`	`}`
`49`	`46`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using CounterStrikeSharp.API;`
`2`	`2`	`using CounterStrikeSharp.API.Core;`
`3`	`3`	`using CounterStrikeSharp.API.Modules.Commands;`
`4`		`-using CounterStrikeSharp.API.Modules.Entities;`
`5`	`4`	`using static RetakesAllocator.Modules.Core;`
`6`	`5`	`using static RetakesAllocator.Modules.Database;`
`7`	`6`	`using Player = RetakesAllocator.Modules.Models.Player;`
`@@ -37,27 +36,19 @@ public static void ReplyToCommand(CommandInfo commandInfo, string msg)`
`37`	`36`	`commandInfo.ReplyToCommand(msg);`
`38`	`37`	`}`
`39`	`38`
`40`		`- public static Player FindPlayer(CCSPlayerController player)`
	`39`	`+ public static Player FindPlayer(CCSPlayerController cCSPlayerController)`
`41`	`40`	`{`
`42`		`- foreach(var playerObj in Players)`
`43`		`- {`
`44`		`- if (playerObj.player == player)`
`45`		`- {`
`46`		`- return playerObj;`
`47`		`- }`
`48`		`- }`
`49`		`-`
`50`		`- return null!;`
	`41`	`+ return Players.Find(player => player.playerIndex == cCSPlayerController.Index)!;`
`51`	`42`	`}`
`52`	`43`
`53`	`44`	`public static void ServerCommand(string command, params object[] args)`
`54`	`45`	`{`
`55`	`46`	`Server.ExecuteCommand(string.Format(command, args));`
`56`	`47`	`}`
`57`	`48`
`58`		`- public static void AddPlayerToList(CCSPlayerController player, SteamID steamId)`
	`49`	`+ public static void AddPlayerToList(CCSPlayerController player)`
`59`	`50`	`{`
`60`		`- if (player == null \|\| !player.IsValid \|\| player.IsBot \|\| steamId is null)`
	`51`	`+ if (player == null \|\| !player.IsValid \|\| player.IsBot)`
`61`	`52`	`{`
`62`	`53`	`return;`
`63`	`54`	`}`
`@@ -67,7 +58,7 @@ public static void AddPlayerToList(CCSPlayerController player, SteamID steamId)`
`67`	`58`	`return;`
`68`	`59`	`}`
`69`	`60`
`70`		`- var playerObj = new Player(player, steamId);`
	`61`	`+ var playerObj = new Player(player);`
`71`	`62`
`72`	`63`	`Players.Add(playerObj);`
`73`	`64`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using CounterStrikeSharp.API.Core;`
`2`	`2`	`using CounterStrikeSharp.API.Modules.Utils;`
`3`	`3`	`using CounterStrikeSharp.API.Modules.Entities.Constants;`
	`4`	`+using RetakesAllocator.Modules.Models;`
`4`	`5`
`5`	`6`	`namespace RetakesAllocator.Modules.Weapons;`
`6`	`7`
`@@ -55,7 +56,9 @@ public enum WeaponType`
`55`	`56`	`new("weapon_deagle", "Desert Eagle")`
`56`	`57`	`};`
`57`	`58`
`58`		`- private readonly CCSPlayerController _player;`
	`59`	`+ private readonly Player _player;`
	`60`	`+`
	`61`	`+ private CCSPlayerController cCSPlayerController => _player.player;`
`59`	`62`
`60`	`63`	`public int PrimaryWeaponT = 0;`
`61`	`64`	`public int PrimaryWeaponCt = 0;`
`@@ -64,7 +67,7 @@ public enum WeaponType`
`64`	`67`	`public GiveAwp GiveAwp = GiveAwp.Never;`
`65`	`68`	`public bool ShouldGiveAwp = false;`
`66`	`69`
`67`		`- public Allocator(CCSPlayerController player)`
	`70`	`+ public Allocator(Player player)`
`68`	`71`	`{`
`69`	`72`	`_player = player;`
`70`	`73`	`}`
`@@ -98,17 +101,17 @@ public bool SetupGiveAwp()`
`98`	`101`
`99`	`102`	`public void Allocate()`
`100`	`103`	`{`
`101`		`- if (_player == null \|\| !_player.IsValid)`
	`104`	`+ if (_player == null \|\| cCSPlayerController == null \|\| !_player.player.IsValid)`
`102`	`105`	`{`
`103`	`106`	`return;`
`104`	`107`	`}`
`105`	`108`
`106`		`- if (!_player.PawnIsAlive)`
	`109`	`+ if (!cCSPlayerController.PawnIsAlive)`
`107`	`110`	`{`
`108`	`111`	`return;`
`109`	`112`	`}`
`110`	`113`
`111`		`- if ((CsTeam)_player.TeamNum < CsTeam.Terrorist \|\| (CsTeam)_player.TeamNum > CsTeam.CounterTerrorist)`
	`114`	`+ if ((CsTeam)cCSPlayerController.TeamNum < CsTeam.Terrorist \|\| (CsTeam)cCSPlayerController.TeamNum > CsTeam.CounterTerrorist)`
`112`	`115`	`{`
`113`	`116`	`return;`
`114`	`117`	`}`
`@@ -120,7 +123,7 @@ public void Allocate()`
`120`	`123`	`}`
`121`	`124`	`else`
`122`	`125`	`{`
`123`		`- if ((CsTeam)_player.TeamNum == CsTeam.Terrorist)`
	`126`	`+ if ((CsTeam)cCSPlayerController.TeamNum == CsTeam.Terrorist)`
`124`	`127`	`{`
`125`	`128`	`primary = PrimaryT[PrimaryWeaponT].Item;`
`126`	`129`	`}`
`@@ -132,14 +135,14 @@ public void Allocate()`
`132`	`135`
`133`	`136`	`string secondary = Pistols[SecondaryWeapon].Item;`
`134`	`137`
`135`		`- _player.GiveNamedItem(primary);`
`136`		`- _player.GiveNamedItem(secondary);`
`137`		`- _player.GiveNamedItem(CsItem.Knife);`
	`138`	`+ cCSPlayerController.GiveNamedItem(primary);`
	`139`	`+ cCSPlayerController.GiveNamedItem(secondary);`
	`140`	`+ cCSPlayerController.GiveNamedItem(CsItem.Knife);`
`138`	`141`
`139`	`142`	`CsItem grenade = SelectGrenade();`
`140`		`- _player.GiveNamedItem(grenade);`
	`143`	`+ cCSPlayerController.GiveNamedItem(grenade);`
`141`	`144`
`142`		`- if (_player.TeamNum == (byte)CsTeam.CounterTerrorist)`
	`145`	`+ if (cCSPlayerController.TeamNum == (byte)CsTeam.CounterTerrorist)`
`143`	`146`	`{`
`144`	`147`	`GiveCtEquipment();`
`145`	`148`	`}`
`@@ -166,7 +169,7 @@ private CsItem SelectGrenade()`
`166`	`169`	`grenade = CsItem.SmokeGrenade;`
`167`	`170`	`break;`
`168`	`171`	`case 3:`
`169`		`- grenade = (CsTeam)_player.TeamNum == CsTeam.Terrorist ? CsItem.Molotov : CsItem.Incendiary;`
	`172`	`+ grenade = (CsTeam)cCSPlayerController.TeamNum == CsTeam.Terrorist ? CsItem.Molotov : CsItem.Incendiary;`
`170`	`173`	`break;`
`171`	`174`	`}`
`172`	`175`
`@@ -175,16 +178,16 @@ private CsItem SelectGrenade()`
`175`	`178`
`176`	`179`	`private void GiveCtEquipment()`
`177`	`180`	`{`
`178`		`- _player.GiveNamedItem(CsItem.KevlarHelmet);`
	`181`	`+ cCSPlayerController.GiveNamedItem(CsItem.KevlarHelmet);`
`179`	`182`
`180`	`183`	`if (`
`181`		`- (CsTeam)_player.TeamNum == CsTeam.CounterTerrorist`
`182`		`- && _player.PlayerPawn.IsValid`
`183`		`- && _player.PlayerPawn.Value != null`
`184`		`- && _player.PlayerPawn.Value.IsValid`
`185`		`- && _player.PlayerPawn.Value.ItemServices != null`
	`184`	`+ (CsTeam)cCSPlayerController.TeamNum == CsTeam.CounterTerrorist`
	`185`	`+ && cCSPlayerController.PlayerPawn.IsValid`
	`186`	`+ && cCSPlayerController.PlayerPawn.Value != null`
	`187`	`+ && cCSPlayerController.PlayerPawn.Value.IsValid`
	`188`	`+ && cCSPlayerController.PlayerPawn.Value.ItemServices != null`
`186`	`189`	`) {`
`187`		`- var itemServices = new CCSPlayer_ItemServices(_player.PlayerPawn.Value.ItemServices.Handle)`
	`190`	`+ var itemServices = new CCSPlayer_ItemServices(cCSPlayerController.PlayerPawn.Value.ItemServices.Handle)`
`188`	`191`	`{`
`189`	`192`	`HasDefuser = true`
`190`	`193`	`};`
`@@ -193,6 +196,6 @@ private void GiveCtEquipment()`
`193`	`196`
`194`	`197`	`private void GiveArmor()`
`195`	`198`	`{`
`196`		`- _player.GiveNamedItem(CsItem.KevlarHelmet);`
	`199`	`+ cCSPlayerController.GiveNamedItem(CsItem.KevlarHelmet);`
`197`	`200`	`}`
`198`	`201`	`}`