|
3 | 3 | using SwiftlyS2.Shared.Players; |
4 | 4 | using SwiftlyS2.Shared.SchemaDefinitions; |
5 | 5 | using SwiftlyS2.Shared.Services; |
| 6 | +using SwiftlyS2.Shared.SteamAPI; |
6 | 7 |
|
7 | 8 | namespace SwiftlyS2.Core.Players; |
8 | 9 |
|
@@ -44,20 +45,7 @@ public IEnumerable<IPlayer> GetAllPlayers() |
44 | 45 | .Select(GetPlayer); |
45 | 46 | } |
46 | 47 |
|
47 | | - private static ulong SteamIDToSteamID64( string steamID ) |
48 | | - { |
49 | | - string[] parts = steamID.Split(':'); |
50 | | - if (parts.Length != 3) return 0; |
51 | | - |
52 | | - int X = int.Parse(parts[1]); |
53 | | - int Y = int.Parse(parts[2]); |
54 | | - |
55 | | - ulong steamID64 = (ulong)Y * 2 + (ulong)X + 76561197960265728UL; |
56 | | - return steamID64; |
57 | | - } |
58 | | - |
59 | | - |
60 | | - public IEnumerable<IPlayer> FindTargettedPlayers( IPlayer player, string target, TargetSearchMode searchMode ) |
| 48 | + public IEnumerable<IPlayer> FindTargettedPlayers( IPlayer player, string target, TargetSearchMode searchMode, StringComparison nameComparison = StringComparison.OrdinalIgnoreCase ) |
61 | 49 | { |
62 | 50 | IEnumerable<IPlayer> allPlayers = []; |
63 | 51 |
|
@@ -147,15 +135,11 @@ public IEnumerable<IPlayer> FindTargettedPlayers( IPlayer player, string target, |
147 | 135 | allPlayers = allPlayers.Append(targetPlayer); |
148 | 136 | } |
149 | 137 | } |
150 | | - else if (targetPlayer.Controller.PlayerName.Contains(target)) |
151 | | - { |
152 | | - allPlayers = allPlayers.Append(targetPlayer); |
153 | | - } |
154 | | - else if (ulong.TryParse(target, out ulong steamId) && targetPlayer.SteamID == steamId) |
| 138 | + else if (targetPlayer.Controller.PlayerName.Contains(target, nameComparison)) |
155 | 139 | { |
156 | 140 | allPlayers = allPlayers.Append(targetPlayer); |
157 | 141 | } |
158 | | - else if (SteamIDToSteamID64(target) == targetPlayer.SteamID) |
| 142 | + else if (new CSteamID(target) is var steamId && steamId.IsValid() && steamId.GetSteamID64() == targetPlayer.SteamID) |
159 | 143 | { |
160 | 144 | allPlayers = allPlayers.Append(targetPlayer); |
161 | 145 | } |
|
0 commit comments