Don't use built-in function to get players by steam id

KarlOfDuty · Oct 26, 2024 · 6a333b9 · 6a333b9
1 parent d143d1d
commit 6a333b9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/SCPDiscordPlugin/BotCommands/BanCommand.cs b/SCPDiscordPlugin/BotCommands/BanCommand.cs
@@ -87,7 +87,7 @@ public static void Execute(Interface.BanCommand command)
 
       // Send player banned event if player is online, and add ipban
       bool offlineBan = true;
-      if (Player.TryGet(command.SteamID.EndsWith("@steam") ? command.SteamID : command.SteamID + "@steam", out Player player))
+      if (Utilities.TryGetPlayer(command.SteamID, out Player player))
       {
         offlineBan = false;
         banVars.AddPlayerVariables(player, "player");

diff --git a/SCPDiscordPlugin/BotCommands/KickCommand.cs b/SCPDiscordPlugin/BotCommands/KickCommand.cs
@@ -30,7 +30,7 @@ public static void Execute(Interface.KickCommand command)
       }
 
       //Get player name for feedback message
-      if (!Player.TryGet(command.SteamID, out Player player))
+      if (!Utilities.TryGetPlayer(command.SteamID, out Player player))
       {
         Dictionary<string, string> vars = new Dictionary<string, string>
         {

diff --git a/SCPDiscordPlugin/BotCommands/MuteCommand.cs b/SCPDiscordPlugin/BotCommands/MuteCommand.cs
@@ -78,7 +78,7 @@ private static void MutePlayer(Interface.MuteCommand command, DateTime endTime,
       string userID = command.SteamID.EndsWith("@steam") ? command.SteamID : command.SteamID + "@steam";
       string playerName = "";
 
-      if (Player.TryGet(userID, out Player player))
+      if (Utilities.TryGetPlayer(userID, out Player player))
       {
         MuteSystem.ignoreUserID = userID;
         if (!EventManager.ExecuteEvent(new PlayerMutedEvent(player.ReferenceHub, Server.Instance.ReferenceHub, false)))
@@ -171,7 +171,7 @@ private static void UnmutePlayer(Interface.MuteCommand command)
       string userID = command.SteamID.EndsWith("@steam") ? command.SteamID : command.SteamID + "@steam";
       string playerName = "";
 
-      if (Player.TryGet(userID, out Player player))
+      if (Utilities.TryGetPlayer(userID, out Player player))
       {
         MuteSystem.ignoreUserID = userID;
         if (!EventManager.ExecuteEvent(new PlayerUnmutedEvent(player.ReferenceHub, Server.Instance.ReferenceHub, false)))

diff --git a/SCPDiscordPlugin/BotCommands/PlayerInfoCommand.cs b/SCPDiscordPlugin/BotCommands/PlayerInfoCommand.cs
@@ -48,7 +48,7 @@ public static void Execute(Interface.PlayerInfoCommand command)
         }
       }
 
-      if (Player.TryGet(command.SteamID, out Player player))
+      if (Utilities.TryGetPlayer(command.SteamID, out Player player))
       {
         Dictionary<string, string> vars = new Dictionary<string, string>
         {

diff --git a/SCPDiscordPlugin/MuteSystem.cs b/SCPDiscordPlugin/MuteSystem.cs
@@ -95,7 +95,7 @@ private static async Task SchedulePlayerCheck(DateTime targetTime, ulong steamID
         await Task.Delay(remaining);
       }
 
-      if (Player.TryGet(userId, out Player player))
+      if (Utilities.TryGetPlayer(userId, out Player player))
       {
         CheckMuteStatus(player);
       }

diff --git a/SCPDiscordPlugin/Utilities.cs b/SCPDiscordPlugin/Utilities.cs
@@ -72,6 +72,21 @@ public static string TicksToCompoundTime(long ticks)
       return SecondsToCompoundTime(ticks / TimeSpan.TicksPerSecond);
     }
 
+    public static bool TryGetPlayer(string userID, out Player pl)
+    {
+      foreach (Player player in Player.GetPlayers<Player>())
+      {
+        if (userID.Contains(player.GetParsedUserID()))
+        {
+          pl = player;
+          return true;
+        }
+      }
+
+      pl = null;
+      return false;
+    }
+
     public static bool TryGetPlayerName(string userID, out string name)
     {
       foreach (Player player in Player.GetPlayers<Player>())
-Original file line number
+Diff line change
@@ Expand Up @@
             }
           }
-          if (Player.TryGet(command.SteamID, out Player player))
+          if (Utilities.TryGetPlayer(command.SteamID, out Player player))
           {
             Dictionary<string, string> vars = new Dictionary<string, string>
             {
@@ Expand Down @@