Changeset 156 for binary-improvements/7dtd-server-fixes

Timestamp:

Sep 3, 2014, 12:04:42 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes/src

Files:

• AllocsLogFunctions.cs (modified) (1 diff)
• MapRendering/MapRendering.cs (modified) (1 diff)
• NetConnections/Servers/Web/ApiHandler.cs (modified) (1 diff)
• PersistentData/Players.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs

@@ -38 +38 @@
                 public static void PlayerDisconnected (GameManager manager, int _clientId) {
                         try {
-                                ClientInfo ci = CommonMappingFunctions.GetClientInfoFromClientID (_clientId);
-                                string steamId = CommonMappingFunctions.GetSteamID (ci);
-                                Players players = PersistentContainer.Instance.Players;
-                                if (players.SteamIDs.Contains(steamId))
-                                        players[steamId].SetOffline();
+                                Player p = PersistentContainer.Instance.Players.GetPlayerByClientId(_clientId);
+                                if (p != null) {
+                                        p.SetOffline();
+                                }
                                 PersistentData.PersistentContainer.Instance.Save ();
                         } catch (Exception e) {

binary-improvements/7dtd-server-fixes/src/MapRendering/MapRendering.cs

@@ -59 +59 @@
                                                                         }
                                                                         Instance.dirtyChunks [cPos2] = realColors;
-                                                                        Log.Out ("Add Dirty: " + cPos2);
+                                                                        //Log.Out ("Add Dirty: " + cPos2);
                                                                         Instance.chunkSaveTimer.Stop ();
                                                                         Instance.chunkSaveTimer.Start ();

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs

@@ -26 +26 @@
                                 resp.StatusCode = (int)HttpStatusCode.Forbidden;
                         } else {
-                                foreach (KeyValuePair<string, WebAPI> kvp in apis) {
-                                        if (apiName.StartsWith (kvp.Key)) {
-                                                kvp.Value.HandleRequest (req, resp, user);
-                                                return;
+                                try {
+                                        foreach (KeyValuePair<string, WebAPI> kvp in apis) {
+                                                if (apiName.StartsWith (kvp.Key)) {
+                                                        kvp.Value.HandleRequest (req, resp, user);
+                                                        return;
+                                                }
                                         }
+                                } catch (Exception e) {
+                                        resp.StatusCode = (int)HttpStatusCode.InternalServerError;
                                 }
                         }

binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs

@@ -35 +35 @@
                 }
 
+                public Player GetPlayerByClientId (int _clientid)
+                {
+                        foreach (Player p in players.Values) {
+                                if (p.ClientInfo.clientId == _clientid) {
+                                        return p;
+                                }
+                        }
+                        return null;
+                }
+
                 public string GetSteamID (string _nameOrId, bool _ignoreColorCodes)
                 {