Changeset 369 for binary-improvements/MapRendering/Web/API/GetPlayersOnline.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/MapRendering/Web/API/GetPlayersOnline.cs (modified) (4 diffs)

binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs

@@ -13 +13 @@
                         foreach (KeyValuePair<int, EntityPlayer> current in w.Players.dict) {
                                 ClientInfo ci = ConnectionManager.Instance.Clients.ForEntityId (current.Key);
-                                Player player = PersistentContainer.Instance.Players [ci.playerId, false];
+                                Player player = PersistentContainer.Instance.Players [ci.PlatformId, false];
 
                                 JSONObject pos = new JSONObject ();
@@ -21 +21 @@
 
                                 JSONObject p = new JSONObject ();
-                                p.Add ("steamid", new JSONString (ci.playerId));
+                                p.Add ("steamid", new JSONString (ci.PlatformId.CombinedString));
                                 p.Add ("entityid", new JSONNumber (ci.entityId));
                                 p.Add ("ip", new JSONString (ci.ip));
@@ -28 +28 @@
                                 p.Add ("position", pos);
 
-                                // Deprecated!
-                                p.Add ("experience", new JSONNumber (-1));
-
-                                p.Add ("level", new JSONNumber (player != null ? player.Level : -1));
+                                p.Add ("level", new JSONNumber (player?.Level ?? -1));
                                 p.Add ("health", new JSONNumber (current.Value.Health));
                                 p.Add ("stamina", new JSONNumber (current.Value.Stamina));
@@ -39 +36 @@
                                 p.Add ("score", new JSONNumber (current.Value.Score));
 
-                                p.Add ("totalplaytime", new JSONNumber (player != null ? player.TotalPlayTime : -1));
+                                p.Add ("totalplaytime", new JSONNumber (player?.TotalPlayTime ?? -1));
                                 p.Add ("lastonline", new JSONString (player != null ? player.LastOnline.ToString ("s") : string.Empty));
                                 p.Add ("ping", new JSONNumber (ci.ping));