Changeset 369 for binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs

Timestamp:

Nov 9, 2021, 6:28:33 PM (3 years ago)

Author:

alloc

Message:

Preparations for A20 release
Changes usage of "SteamID" to "UserID" in console commands
Also changes a bunch of the WebAPI stuff to show / use UserIDs

File:

• binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs (modified) (2 diffs)

binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using Platform.Steam;
 
 namespace AllocsFixes.PersistentData {
         [Serializable]
         public class Players {
-                public readonly Dictionary<string, Player> Dict = new Dictionary<string, Player> (StringComparer.OrdinalIgnoreCase);
+                public readonly Dictionary<PlatformUserIdentifierAbs, Player> Dict = new Dictionary<PlatformUserIdentifierAbs, Player> ();
 
-                public Player this [string _steamId, bool _create] {
+                public Player this [PlatformUserIdentifierAbs _platformId, bool _create] {
                         get {
-                                if (string.IsNullOrEmpty (_steamId)) {
+                                if (_platformId == null) {
                                         return null;
                                 }
 
-                                if (Dict.ContainsKey (_steamId)) {
-                                        return Dict [_steamId];
+                                if (Dict.TryGetValue (_platformId, out Player pOld)) {
+                                        return pOld;
                                 }
 
-                                if (!_create || _steamId.Length != 17) {
+                                if (!_create) {
                                         return null;
                                 }
 
-                                Log.Out ("Created new player entry for ID: " + _steamId);
-                                Player p = new Player (_steamId);
-                                Dict.Add (_steamId, p);
+                                Log.Out ("Created new player entry for ID: " + _platformId);
+                                Player p = new Player (_platformId);
+                                Dict.Add (_platformId, p);
                                 return p;
                         }
                 }
 
-                public int Count {
-                        get { return Dict.Count; }
-                }
+                public int Count => Dict.Count;
 
-//              public Player GetPlayerByNameOrId (string _nameOrId, bool _ignoreColorCodes)
-//              {
-//                      string sid = GetSteamID (_nameOrId, _ignoreColorCodes);
-//                      if (sid != null)
-//                              return this [sid];
-//                      else
-//                              return null;
-//              }
-
-                public string GetSteamID (string _nameOrId, bool _ignoreColorCodes) {
-                        if (_nameOrId == null || _nameOrId.Length == 0) {
+                public PlatformUserIdentifierAbs GetSteamID (string _nameOrId, bool _ignoreColorCodes) {
+                        if (string.IsNullOrEmpty (_nameOrId)) {
                                 return null;
                         }
 
-                        long tempLong;
-                        if (_nameOrId.Length == 17 && long.TryParse (_nameOrId, out tempLong)) {
-                                return _nameOrId;
+                        if (PlatformUserIdentifierAbs.TryFromCombinedString (_nameOrId, out PlatformUserIdentifierAbs userId)) {
+                                return userId;
                         }
 
-                        int entityId;
-                        if (int.TryParse (_nameOrId, out entityId)) {
-                                foreach (KeyValuePair<string, Player> kvp in Dict) {
+                        if (int.TryParse (_nameOrId, out int entityId)) {
+                                foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in Dict) {
                                         if (kvp.Value.IsOnline && kvp.Value.EntityID == entityId) {
                                                 return kvp.Key;
@@ -61 +49 @@
                         }
 
-                        foreach (KeyValuePair<string, Player> kvp in Dict) {
+                        foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in Dict) {
                                 string name = kvp.Value.Name;
                                 if (_ignoreColorCodes) {