Fix Steam ID Format

- Accounts for change in player's display name to grab SteamID64
data-bomb · Sep 5, 2024 · 2ca73a8 · 2ca73a8
1 parent c1fe88c
commit 2ca73a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Si_AdminMod/HostActions.cs b/Si_AdminMod/HostActions.cs
@@ -29,7 +29,7 @@ public class HostAction
     {
         public static bool AddAdmin(Player player, String powerText, byte level)
         {
-            long playerSteamId = long.Parse(player.ToString().Split('_')[1]);
+            long playerSteamId = (long)player.PlayerID.SteamID.m_SteamID;
 
             if (SiAdminMod.AdminList == null)
             {

diff --git a/Si_AdminMod/PlayerExtension.cs b/Si_AdminMod/PlayerExtension.cs
@@ -27,7 +27,7 @@ public class PlayerAdmin : Player
     {
         public static bool CanAdminExecute(Player callerPlayer, Power power, Player? targetPlayer = null)
         {
-            long playerSteamId = long.Parse(callerPlayer.ToString().Split('_')[1]);
+            long playerSteamId = (long)callerPlayer.PlayerID.SteamID.m_SteamID;
             Admin? callerMatch = AdminMethods.FindAdminFromSteamId(playerSteamId);
             Power callerPowers = Power.None;
             if (callerMatch != null)
@@ -64,15 +64,15 @@ public static bool CanAdminExecute(Player callerPlayer, Power power, Player? tar
 
         public static bool CanAdminTarget(Player callerPlayer, Player targetPlayer)
         {
-            long callerSteamId = long.Parse(callerPlayer.ToString().Split('_')[1]);
+            long callerSteamId = (long)callerPlayer.PlayerID.SteamID.m_SteamID;
             Admin? callerMatch = AdminMethods.FindAdminFromSteamId(callerSteamId);
             byte callerLevel = 0;
             if (callerMatch != null)
             {
                 callerLevel = callerMatch.Level;
             }
 
-            long targetSteamId = long.Parse(targetPlayer.ToString().Split('_')[1]);
+            long targetSteamId = (long)targetPlayer.PlayerID.SteamID.m_SteamID;
             Admin? targetMatch = AdminMethods.FindAdminFromSteamId(targetSteamId);
             byte targetLevel = 0;
             if (targetMatch != null)
@@ -90,7 +90,7 @@ public static bool CanAdminTarget(Player callerPlayer, Player targetPlayer)
 
         public static Power GetAdminPowers(Player callerPlayer)
         {
-            long callerSteamId = long.Parse(callerPlayer.ToString().Split('_')[1]);
+            long callerSteamId = (long)callerPlayer.PlayerID.SteamID.m_SteamID;
             Admin? match = AdminMethods.FindAdminFromSteamId(callerSteamId);
             if (match != null)
             {
@@ -102,7 +102,7 @@ public static Power GetAdminPowers(Player callerPlayer)
 
         public static byte GetAdminLevel(Player callerPlayer)
         {
-            long callerSteamId = long.Parse(callerPlayer.ToString().Split('_')[1]);
+            long callerSteamId = (long)callerPlayer.PlayerID.SteamID.m_SteamID;
             Admin? match = AdminMethods.FindAdminFromSteamId(callerSteamId);
             if (match != null)
             {
@@ -114,7 +114,7 @@ public static byte GetAdminLevel(Player callerPlayer)
 
         public static bool IsAdmin(Player callerPlayer)
         {
-            long callerSteamId = long.Parse(callerPlayer.ToString().Split('_')[1]);
+            long callerSteamId = (long)callerPlayer.PlayerID.SteamID.m_SteamID;
             Admin? match = AdminMethods.FindAdminFromSteamId(callerSteamId);
             if (match != null)
             {