Changeset 168 for binary-improvements/7dtd-server-fixes/src

Timestamp:

Sep 5, 2014, 4:03:00 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

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

Files:

• MapRendering/MapRenderBlockBuffer.cs (modified) (2 diffs)
• MapRendering/MapRendering.cs (modified) (2 diffs)
• NetConnections/Servers/Web/API/GetPlayerInventory.cs (modified) (1 diff)
• NetConnections/Servers/Web/Web.cs (modified) (3 diffs)

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

@@ -17 +17 @@
                 {
                         zoomLevel = level;
+                }
+
+                public void ResetBlock ()
+                {
+                        currentBlockMap = string.Empty;
                 }
 
@@ -39 +44 @@
                                 if (!fileName.Equals (currentBlockMap)) {
                                         res = true;
-                                        SaveBlock();
+                                        SaveBlock ();
                                         loadTextureFromFile (fileName);
                                 }

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

@@ -82 +82 @@
                         Texture2D fullMapTexture = null;
 
-                        if (Directory.Exists (Constants.MAP_DIRECTORY))
-                                Directory.Delete (Constants.MAP_DIRECTORY, true);
-
-                        renderingFullMap = true;
-
                         Vector2i minChunk = default(Vector2i), maxChunk = default(Vector2i);
                         Vector2i minPos = default(Vector2i), maxPos = default(Vector2i);
@@ -99 +94 @@
                         );
 
-                        if (widthPix <= 8000 && heightPix <= 8000)
-                                fullMapTexture = new Texture2D (widthPix, heightPix);
-
                         Monitor.Enter (Instance.zoomLevelBuffers);
                         try {
+                                for (int i = 0; i < Constants.ZOOMLEVELS; i++) {
+                                        zoomLevelBuffers [i].ResetBlock ();
+                                }
+
+                                if (Directory.Exists (Constants.MAP_DIRECTORY))
+                                        Directory.Delete (Constants.MAP_DIRECTORY, true);
+
+                                renderingFullMap = true;
+
+                                if (widthPix <= 8000 && heightPix <= 8000)
+                                        fullMapTexture = new Texture2D (widthPix, heightPix);
+
                                 Vector2i curFullMapPos = default(Vector2i);
                                 Vector2i curChunkPos = default(Vector2i);

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

@@ -11 +11 @@
                 public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, HttpListenerBasicIdentity user)
                 {
-                        Log.Out ("" + req.QueryString);
-
                         if (req.QueryString ["steamid"] == null) {
                                 resp.StatusCode = (int)HttpStatusCode.InternalServerError;

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Net;
 using System.Text;
@@ -25 +26 @@
 
                                 _listener.Prefixes.Add (String.Format ("http://*:{0}/", port));
-                                //_listener.AuthenticationSchemes = AuthenticationSchemes.Basic;
+                                if (File.Exists (Application.dataPath + "/../webserver/protect"))
+                                        _listener.AuthenticationSchemes = AuthenticationSchemes.Basic;
                                 _listener.Start ();
 
@@ -43 +45 @@
                                 );
 
-                                Log.Out ("Started Webserver on " + port);
+                                Log.Out ("Started Webserver on " + port + " (authentication " + (_listener.AuthenticationSchemes == AuthenticationSchemes.Basic ? "enabled" : "disabled") + ")");
                         } catch (Exception e) {
                                 Log.Out ("Error in Web.ctor: " + e);