Changeset 192

Timestamp:

Sep 17, 2014, 12:34:39 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/src/MapRendering/MapRendering.cs (modified) (6 diffs)
• 7dtd-server-fixes/src/PersistentData/Inventory.cs (modified) (1 diff)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/7dtd-server-fixes_version.txt (modified) (1 diff)

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

@@ -22 +22 @@
                 }
 
+                private static object lockObject = new object ();
                 private MapRenderBlockBuffer[] zoomLevelBuffers;
                 private Dictionary<Vector2i, Color[]> dirtyChunks = new Dictionary<Vector2i, Color[]> ();
@@ -33 +34 @@
                         Constants.MAP_DIRECTORY = StaticDirectories.GetSaveGameDir () + "/map";
 
-                        if (File.Exists (Constants.MAP_DIRECTORY + "/mapinfo.json")) {
-                                LoadMapInfo ();
-                        } else {
-                                WriteMapInfo ();
+                        lock (lockObject) {
+                                if (!LoadMapInfo ())
+                                        WriteMapInfo ();
                         }
 
@@ -55 +55 @@
                                         try {
                                                 if (!Instance.renderingFullMap) {
-                                                        lock (Instance.zoomLevelBuffers) {
+                                                        lock (lockObject) {
                                                                 Chunk c = (Chunk)o;
                                                                 Vector3i cPos = c.GetWorldPos ();
@@ -100 +100 @@
                         );
 
-                        lock (Instance.zoomLevelBuffers) {
+                        lock (lockObject) {
                                 for (int i = 0; i < Constants.ZOOMLEVELS; i++) {
                                         zoomLevelBuffers [i].ResetBlock ();
@@ -172 +172 @@
                 private void TimedRendering (object source, System.Timers.ElapsedEventArgs e)
                 {
-                        lock (zoomLevelBuffers) {
+                        lock (lockObject) {
                                 RenderDirtyChunks ();
                                 if (dirtyChunks.Count > 0)
@@ -251 +251 @@
                 }
 
-                private void LoadMapInfo ()
+                private bool LoadMapInfo ()
                 {
                         if (File.Exists (Constants.MAP_DIRECTORY + "/mapinfo.json")) {
                                 string json = File.ReadAllText (Constants.MAP_DIRECTORY + "/mapinfo.json", Encoding.UTF8);
-                                JSONNode node = Parser.Parse (json);
-                                if (node is JSONObject) {
-                                        JSONObject jo = (JSONObject)node;
-                                        if (jo.ContainsKey ("blockSize"))
-                                                Constants.MAP_BLOCK_SIZE = ((JSONNumber)jo ["blockSize"]).GetInt ();
-                                        if (jo.ContainsKey ("maxZoom"))
-                                                Constants.ZOOMLEVELS = ((JSONNumber)jo ["maxZoom"]).GetInt () + 1;
-                                }
-                        }
+                                try {
+                                        JSONNode node = Parser.Parse (json);
+                                        if (node is JSONObject) {
+                                                JSONObject jo = (JSONObject)node;
+                                                if (jo.ContainsKey ("blockSize"))
+                                                        Constants.MAP_BLOCK_SIZE = ((JSONNumber)jo ["blockSize"]).GetInt ();
+                                                if (jo.ContainsKey ("maxZoom"))
+                                                        Constants.ZOOMLEVELS = ((JSONNumber)jo ["maxZoom"]).GetInt () + 1;
+                                                return true;
+                                        }
+                                } catch (MalformedJSONException e) {
+                                        Log.Out ("Exception in LoadMapInfo: " + e);
+                                } catch (InvalidCastException e) {
+                                        Log.Out ("Exception in LoadMapInfo: " + e);
+                                }
+                        }
+                        return false;
                 }
 

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

@@ -20 +20 @@
                 public void Update (PlayerDataFile pdf)
                 {
-                        Log.Out ("Updating player inventory - player id: " + pdf.id);
+                        //Log.Out ("Updating player inventory - player id: " + pdf.id);
                         ProcessInv (bag, pdf.bag);
                         ProcessInv (belt, pdf.inventory);

binary-improvements/bin/Release/7dtd-server-fixes_version.txt

@@ -1 @@
-Version:       0.93.5369.22980
+Version:       0.93.5373.22608