Changeset 446 for binary-improvements/MapRendering/Web

Timestamp:

Jun 12, 2023, 3:21:34 PM (17 months ago)

Author:

alloc

Message:

24_27_41

Location:

binary-improvements/MapRendering/Web/API

Files:

• GetLandClaims.cs (modified) (1 diff)
• GetPlayerInventories.cs (modified) (1 diff)
• GetPlayerInventory.cs (modified) (4 diffs)
• GetPlayerList.cs (modified) (2 diffs)
• GetPlayersLocation.cs (modified) (2 diffs)
• GetPlayersOnline.cs (modified) (2 diffs)

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

@@ -51 +51 @@
 
                                 owner.Add ("steamid", new JSONString (kvp.Key.PlatformId.CombinedString));
+                                owner.Add ("crossplatformid", new JSONString (kvp.Key.CrossPlatformId?.CombinedString ?? ""));
                                 owner.Add ("claimactive", new JSONBoolean (kvp.Key.LandProtectionActive));
 

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

@@ -20 +20 @@
 
                                 if (p.IsOnline) {
-                                        AllInventoriesResult.Add (GetPlayerInventory.DoPlayer (kvp.Key.CombinedString, p, showIconColor, showIconName));
+                                        AllInventoriesResult.Add (GetPlayerInventory.DoPlayer (p, showIconColor, showIconName));
                                 }
                         }

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

@@ -21 +21 @@
                         }
 
-                        Player p = PersistentContainer.Instance.Players [userId, false];
+                        Player p = PersistentContainer.Instance.Players.GetByUserId (userId);
                         if (p == null) {
                                 _resp.StatusCode = (int) HttpStatusCode.NotFound;
@@ -30 +30 @@
                         GetInventoryArguments (_req, out bool showIconColor, out bool showIconName);
 
-                        JSONObject result = DoPlayer (userIdString, p, showIconColor, showIconName);
+                        JSONObject result = DoPlayer (p, showIconColor, showIconName);
 
                         WriteJSON (_resp, result);
@@ -45 +45 @@
                 }
 
-                internal static JSONObject DoPlayer (string _steamId, Player _player, bool _showIconColor, bool _showIconName) {
+                internal static JSONObject DoPlayer (Player _player, bool _showIconColor, bool _showIconName) {
                         PersistentData.Inventory inv = _player.Inventory;
 
@@ -53 +53 @@
                         JSONArray belt = new JSONArray ();
                         JSONObject equipment = new JSONObject ();
-                        result.Add ("userid", new JSONString (_steamId));
+                        result.Add ("userid", new JSONString (_player.PlatformId.CombinedString));
+                        result.Add ("crossplatformid", new JSONString (_player.CrossPlatformId?.CombinedString ?? ""));
                         result.Add ("entityid", new JSONNumber (_player.EntityID));
                         result.Add ("playername", new JSONString (_player.Name));

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

@@ -49 +49 @@
                                 Player p = kvp.Value;
 
-                                if (bViewAll || p.PlatformId.Equals (userId)) {
+                                if (bViewAll || p.InternalId.Equals (userId)) {
                                         JSONObject pos = new JSONObject ();
                                         pos.Add ("x", new JSONNumber (p.LastPosition.x));
@@ -56 +56 @@
 
                                         JSONObject pJson = new JSONObject ();
-                                        pJson.Add ("steamid", new JSONString (kvp.Key.CombinedString));
+                                        pJson.Add ("steamid", new JSONString (kvp.Value.PlatformId.CombinedString));
+                                        pJson.Add ("crossplatformid", new JSONString (kvp.Value.CrossPlatformId?.CombinedString ?? ""));
                                         pJson.Add ("entityid", new JSONNumber (p.EntityID));
                                         pJson.Add ("ip", new JSONString (p.IP));

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

@@ -32 +32 @@
 
                                 if (listOffline || p.IsOnline) {
-                                        if (bViewAll || p.PlatformId.Equals (userId)) {
+                                        if (bViewAll || p.InternalId.Equals (userId)) {
                                                 JSONObject pos = new JSONObject ();
                                                 pos.Add ("x", new JSONNumber (p.LastPosition.x));
@@ -39 +39 @@
 
                                                 JSONObject pJson = new JSONObject ();
-                                                pJson.Add ("steamid", new JSONString (kvp.Key.CombinedString));
+                                                pJson.Add ("steamid", new JSONString (kvp.Value.PlatformId.CombinedString));
+                                                pJson.Add ("crossplatformid", new JSONString (kvp.Value.CrossPlatformId?.CombinedString ?? ""));
 
                                                 //                                      pJson.Add("entityid", new JSONNumber (p.EntityID));

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.InternalId, false];
+                                Player player = PersistentContainer.Instance.Players.GetByInternalId (ci.InternalId);
 
                                 JSONObject pos = new JSONObject ();
@@ -22 +22 @@
                                 JSONObject p = new JSONObject ();
                                 p.Add ("steamid", new JSONString (ci.PlatformId.CombinedString));
+                                p.Add ("crossplatformid", new JSONString (ci.CrossplatformId?.CombinedString ?? ""));
                                 p.Add ("entityid", new JSONNumber (ci.entityId));
                                 p.Add ("ip", new JSONString (ci.ip));