Changeset 253 for binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs

Timestamp:

Dec 12, 2015, 4:08:53 PM (9 years ago)

Author:

alloc

Message:

Fixes 6_8_10

File:

• binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs (modified) (2 diffs)

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

@@ -11 +11 @@
                 public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel)
                 {
-            AdminTools admTools = null;
+            AdminTools admTools = GameManager.Instance.adminTools;
+            user = user ?? new WebConnection ("", "", 0L);
 
-            try { admTools = GameManager.Instance.adminTools; } catch { }
-            try { user = user ?? new WebConnection ("", "", 0L); } catch { } // default user, cheap way to avoid 'null reference exception'
-
-            bool bViewAll = false; try { bViewAll = user.CanViewAllPlayers (permissionLevel); } catch { }
+            bool bViewAll = WebConnection.CanViewAllPlayers (permissionLevel);
 
             JSONArray playersJsResult = new JSONArray ();
@@ -23 +21 @@
 
                         foreach (string sid in playersList.SteamIDs) {
-                try {
-                    if ((admTools != null) && (PetesUtils.ValidText (sid)))
-                        if (admTools.IsBanned (sid))
-                            continue;
+                if (admTools != null)
+                    if (admTools.IsBanned (sid))
+                        continue;
+
+                Player p = playersList [sid, false];
+
+                ulong player_steam_ID = 0L;
+                if (!ulong.TryParse (sid, out player_steam_ID))
+                    player_steam_ID = 0L;
+
+                if ((player_steam_ID == user.SteamID) || bViewAll) {
+                    JSONObject pos = new JSONObject ();
+                    pos.Add("x", new JSONNumber (p.LastPosition.x));
+                    pos.Add("y", new JSONNumber (p.LastPosition.y));
+                    pos.Add("z", new JSONNumber (p.LastPosition.z));
+
+                    JSONObject pJson = new JSONObject ();
+                    pJson.Add("steamid", new JSONString (sid));
+                    pJson.Add("ip", new JSONString (p.IP));
+                    pJson.Add("name", new JSONString (p.Name));
+                    pJson.Add("online", new JSONBoolean (p.IsOnline));
+                    pJson.Add("position", pos);
+
+                    playersJsResult.Add (pJson);
                 }
-                catch { }
-
-                try
-                {
-                    Player p = playersList [sid, false];
-
-                    ulong player_steam_ID = 0L;
-                    if (!ulong.TryParse (sid, out player_steam_ID))
-                        player_steam_ID = 0L;
-
-                    if ((player_steam_ID == user.SteamID) || bViewAll) {
-                        JSONObject pos = new JSONObject ();
-                        pos.Add("x", new JSONNumber (p.LastPosition.x));
-                        pos.Add("y", new JSONNumber (p.LastPosition.y));
-                        pos.Add("z", new JSONNumber (p.LastPosition.z));
-
-                        JSONObject pJson = new JSONObject ();
-                        pJson.Add("steamid", new JSONString (sid));
-                        pJson.Add("ip", new JSONString (p.IP));
-                        pJson.Add("name", new JSONString (p.Name));
-                        pJson.Add("online", new JSONBoolean (p.IsOnline));
-                        pJson.Add("position", pos);
-
-                        playersJsResult.Add (pJson);
-                    }
-                }
-                catch { }
             }