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

Timestamp:

Oct 28, 2015, 7:51:20 PM (9 years ago)

Author:

peter.souza

Message:

Enemies (zombies and hostile animal entities) are now shown on the map as Hostiles and require permission level 'webapi.gethostilelocation' for web viewers to see.

Animals (non-hostile entities) are now shown on the map as Animals and require permission level 'webapi.getanimalslocation' for web viewers to see.

Permission level for 'webapi.viewallclaims' is now required for a viewer to see all claims, otherwise the permission level for 'webapi.getlandclaims' will only show viewer-owned claims. A viewer requires both 'webapi.getlandclaims' and 'webapi.viewallclaims' to be set for all claims to show (you can't just set 'webapi.viewallclaims').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Permission level for 'webapi.viewallplayers' is now required for a viewer to see all players, otherwise the permission level for 'webapi.getplayerslocation' will only show the player for the currently-authenticated viewer. A viewer requires both 'webapi.getplayerslocation' and 'webapi.viewallplayers' to be set for all players to show (you can't just set 'webapi.viewallplayers').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Banned players are now hidden from the web map.
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=320702&viewfull=1#post320702

Items using 'CustomIcon' and 'CustomIconTint' are now supported (although the exact tinting may not be perfectly the same as the game).
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317117&viewfull=1#post317117
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317679&viewfull=1#post317679

Map marker icons for players, hostiles, and animals have been updated.

File:

• binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs (modified) (1 diff)

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

@@ -11 +11 @@
                 public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel)
                 {
-                        JSONArray playersJsResult = new JSONArray ();
+            AdminTools admTools = null;
+
+            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 { }
+
+            JSONArray playersJsResult = new JSONArray ();
 
                         Players playersList = PersistentContainer.Instance.Players;
 
                         foreach (string sid in playersList.SteamIDs) {
-                                Player p = playersList[sid, false];
+                try {
+                    if ((admTools != null) && (PetesUtils.ValidText (sid)))
+                        if (admTools.IsBanned (sid))
+                            continue;
+                }
+                catch { }
 
-                                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));
+                try
+                {
+                    Player p = playersList [sid, false];
 
-                                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);
+                    ulong player_steam_ID = 0L;
+                    if (!ulong.TryParse (sid, out player_steam_ID))
+                        player_steam_ID = 0L;
 
-                                playersJsResult.Add(pJson);
-                        }
+                    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));
 
-                        WriteJSON(resp, playersJsResult);
+                        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 { }
+            }
+
+                        WriteJSON (resp, playersJsResult);
                 }
         }