Hull volume helper in editor + Character name matches client name + Better-looking Watcher light source

Also '' is a thing of the past, use \" instead
2016-11-20 18:47:22 -03:00
parent 2d6196b5f0
commit 7a3bce3973
12 changed files with 98 additions and 42 deletions
@@ -143,14 +143,14 @@ namespace Barotrauma.Networking
                inc.SenderConnection.Disconnect("The name \"" + name + "\" is already in use. Please choose another name.");
                DebugConsole.NewMessage(name + " couldn't join the server (name already in use)", Color.Red);
                return;
-            }
-
+            }
+
 #endif
-            if (!whitelist.IsWhiteListed(name, inc.SenderConnection.RemoteEndPoint.Address.ToString()))
-            {
+            if (!whitelist.IsWhiteListed(name, inc.SenderConnection.RemoteEndPoint.Address.ToString()))
+            {
                inc.SenderConnection.Disconnect("You're not in this server's whitelist.");
                DebugConsole.NewMessage(name + " (" + inc.SenderConnection.RemoteEndPoint.Address.ToString() + ") couldn't join the server (not in whitelist)", Color.Red);
-                return;
+                return;
            }

            //existing user re-joining