Changeset 332 for binary-improvements/MapRendering/Web/API/GetPlayerList.cs

Timestamp:

Nov 16, 2018, 10:38:46 PM (6 years ago)

Author:

alloc

Message:

*Latest optimizations

File:

• binary-improvements/MapRendering/Web/API/GetPlayerList.cs (modified) (6 diffs)

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

@@ -6 +6 @@
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;
+using UnityEngine.Profiling;
 
 namespace AllocsFixes.NetConnections.Servers.Web.API {
@@ -12 +13 @@
                         new Regex (@"^(>=|=>|>|<=|=<|<|==|=)?\s*([0-9]+(\.[0-9]*)?)$");
 
+#if ENABLE_PROFILER
+                private static readonly CustomSampler jsonSerializeSampler = CustomSampler.Create ("JSON_Build");
+#endif
+
                 public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user,
                         int permissionLevel) {
                         AdminTools admTools = GameManager.Instance.adminTools;
-                        user = user ?? new WebConnection ("", "", 0L);
+                        user = user ?? new WebConnection ("", IPAddress.None, 0L);
 
                         bool bViewAll = WebConnection.CanViewAllPlayers (permissionLevel);
@@ -35 +40 @@
                         Players playersList = PersistentContainer.Instance.Players;
 
+                        
                         List<JSONObject> playerList = new List<JSONObject> ();
 
-                        foreach (string sid in playersList.SteamIDs) {
-                                Player p = playersList [sid, false];
+#if ENABLE_PROFILER
+                        jsonSerializeSampler.Begin ();
+#endif
+
+                        foreach (KeyValuePair<string, Player> kvp in playersList.Dict) {
+                                Player p = kvp.Value;
 
                                 ulong player_steam_ID;
-                                if (!ulong.TryParse (sid, out player_steam_ID)) {
+                                if (!ulong.TryParse (kvp.Key, out player_steam_ID)) {
                                         player_steam_ID = 0L;
                                 }
@@ -52 +62 @@
 
                                         JSONObject pJson = new JSONObject ();
-                                        pJson.Add ("steamid", new JSONString (sid));
+                                        pJson.Add ("steamid", new JSONString (kvp.Key));
                                         pJson.Add ("entityid", new JSONNumber (p.EntityID));
                                         pJson.Add ("ip", new JSONString (p.IP));
@@ -66 +76 @@
                                         JSONBoolean banned;
                                         if (admTools != null) {
-                                                banned = new JSONBoolean (admTools.IsBanned (sid));
+                                                banned = new JSONBoolean (admTools.IsBanned (kvp.Key));
                                         } else {
                                                 banned = new JSONBoolean (false);
@@ -76 +86 @@
                                 }
                         }
+
+#if ENABLE_PROFILER
+                        jsonSerializeSampler.End ();
+#endif
 
                         IEnumerable<JSONObject> list = playerList;