Changeset 383 for binary-improvements2/MapRendering/Web

Timestamp:

Aug 1, 2022, 1:16:11 PM (2 years ago)

Author:

alloc

Message:

Fixed a bunch of warnings

Location:

binary-improvements2/MapRendering/Web

Files:

• API/GetAllowedCommands.cs (modified) (1 diff)
• API/GetAnimalsLocation.cs (modified) (1 diff)
• API/GetHostileLocation.cs (modified) (1 diff)
• API/GetLog.cs (modified) (1 diff)
• API/GetPlayerInventories.cs (modified) (1 diff)
• API/GetPlayerList.cs (modified) (1 diff)
• API/GetPlayersLocation.cs (modified) (1 diff)
• API/GetPlayersOnline.cs (modified) (1 diff)
• API/GetServerInfo.cs (modified) (1 diff)
• API/GetStats.cs (modified) (1 diff)
• API/GetWebUIUpdates.cs (modified) (1 diff)
• API/Null.cs (modified) (1 diff)
• Handlers/AbsHandler.cs (modified) (1 diff)
• Handlers/SimpleRedirectHandler.cs (modified) (1 diff)
• Web.cs (modified) (3 diffs)

binary-improvements2/MapRendering/Web/API/GetAllowedCommands.cs

@@ -1 @@
-using System.Net;
 using AllocsFixes.JSON;
 using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;

binary-improvements2/MapRendering/Web/API/GetAnimalsLocation.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;

binary-improvements2/MapRendering/Web/API/GetHostileLocation.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;

binary-improvements2/MapRendering/Web/API/GetLog.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;

binary-improvements2/MapRendering/Web/API/GetPlayerInventories.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;

binary-improvements2/MapRendering/Web/API/GetPlayerList.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Text.RegularExpressions;
 using AllocsFixes.JSON;

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

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;

binary-improvements2/MapRendering/Web/API/GetPlayersOnline.cs

@@ -1 +1 @@
 using System.Collections.Generic;
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.PersistentData;

binary-improvements2/MapRendering/Web/API/GetServerInfo.cs

@@ -1 +1 @@
 using System;
-using System.Net;
 using AllocsFixes.JSON;
 using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;

binary-improvements2/MapRendering/Web/API/GetStats.cs

@@ -1 @@
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;

binary-improvements2/MapRendering/Web/API/GetWebUIUpdates.cs

@@ -1 @@
-using System.Net;
 using AllocsFixes.JSON;
 using AllocsFixes.LiveData;

binary-improvements2/MapRendering/Web/API/Null.cs

@@ -1 @@
-using System.Net;
-using System.Text;
+using System.Text;
 using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
 using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;

binary-improvements2/MapRendering/Web/Handlers/AbsHandler.cs

@@ -1 @@
-using System.Net;
 using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
 using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;

binary-improvements2/MapRendering/Web/Handlers/SimpleRedirectHandler.cs

@@ -1 @@
-using System.Net;
 using HttpListenerRequest = SpaceWizards.HttpListener.HttpListenerRequest;
 using HttpListenerResponse = SpaceWizards.HttpListener.HttpListenerResponse;

binary-improvements2/MapRendering/Web/Web.cs

@@ -164 +164 @@
                                 response.ProtocolVersion = httpProtocolVersion;
 
+                                // No game yet -> fail request
+                                if (GameManager.Instance.World == null) {
+                                        response.StatusCode = (int) HttpStatusCode.ServiceUnavailable;
+                                        return;
+                                }
+
+                                if (request.Url == null) {
+                                        response.StatusCode = (int) HttpStatusCode.BadRequest;
+                                        return;
+                                }
+
 #if ENABLE_PROFILER
                                 authSampler.Begin ();
@@ -172 +183 @@
 #endif
 
-
                                 //Log.Out ("Login status: conn!=null: {0}, permissionlevel: {1}", conn != null, permissionLevel);
-
 
                                 if (conn != null) {
@@ -186 +195 @@
                                 }
 
-                                // No game yet -> fail request
-                                if (GameManager.Instance.World == null) {
-                                        response.StatusCode = (int) HttpStatusCode.ServiceUnavailable;
-                                        return;
-                                }
-
                                 string requestPath = request.Url.AbsolutePath;