From 6aefc22ac997e20fc4a8c379f3f7d2d27a1b51a6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 17 Jan 2018 19:13:42 -0500
Subject: [PATCH] Stability improvements, minor fixes. Ready to merge.

---
 core/assets/bundles/bundle.properties         |  1 +
 .../mindustry/ui/dialogs/JoinDialog.java      |  2 +-
 kryonet/src/io/anuke/kryonet/KryoServer.java  | 21 +++++++++++++------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f9859472c7..4690a1c9a6 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -46,6 +46,7 @@ text.connecting=[accent]Connecting...
 text.connecting.data=[accent]Loading world data...
 text.connectfail=[crimson]Failed to connect to server: [orange]{0}
 text.server.port=Port:
+text.server.addressinuse=Address already in use!
 text.server.invalidport=Invalid port number!
 text.server.error=[crimson]Error hosting server: [orange]{0}
 text.tutorial.back=< Prev
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
index 14a9f3ee20..2598037933 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
@@ -32,7 +32,7 @@ public class JoinDialog extends FloatingDialog {
         addCloseButton();
 
         join = new FloatingDialog("$text.joingame.title");
-        join.content().add("$text.joingame.ip").left();
+        join.content().add("$text.joingame.ip").padRight(5f).left();
         Mindustry.platforms.addDialog(join.content().addField(Settings.getString("ip"),text ->{
             Settings.putString("ip", text);
             Settings.save();
diff --git a/kryonet/src/io/anuke/kryonet/KryoServer.java b/kryonet/src/io/anuke/kryonet/KryoServer.java
index 0dbddcc22d..2ee5cf6266 100644
--- a/kryonet/src/io/anuke/kryonet/KryoServer.java
+++ b/kryonet/src/io/anuke/kryonet/KryoServer.java
@@ -29,6 +29,7 @@ import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.server.WebSocketServer;
 
 import java.io.IOException;
+import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -156,7 +157,7 @@ public class KryoServer implements ServerProvider {
         Thread thread = new Thread(() ->{
             try {
                 server.close();
-                webServer.stop(1); //please die, right now
+                if(webServer != null) webServer.stop(1); //please die, right now
                 //kill them all
                 for(Thread worker : Thread.getAllStackTraces().keySet()){
                     if(worker.getName().contains("WebSocketWorker")){
@@ -255,7 +256,7 @@ public class KryoServer implements ServerProvider {
     public void dispose(){
         try {
             server.dispose();
-            webServer.stop(1);
+            if(webServer != null) webServer.stop(1);
             //kill them all
             for(Thread thread : Thread.getAllStackTraces().keySet()){
                 if(thread.getName().contains("WebSocketWorker")){
@@ -378,20 +379,24 @@ public class KryoServer implements ServerProvider {
         @Override
         public void onClose(WebSocket conn, int code, String reason, boolean remote) {
             if (conn == null) return;
-            Disconnect disconnect = new Disconnect();
             KryoConnection k = getBySocket(conn);
-            if(k != null) Net.handleServerReceived(disconnect, k.id);
+            if(k == null) return;
+            Disconnect disconnect = new Disconnect();
+            disconnect.id = k.id;
+            Net.handleServerReceived(disconnect, k.id);
         }
 
         @Override
         public void onMessage(WebSocket conn, String message) {
             try {
+                KryoConnection k = getBySocket(conn);
+                if (k == null) return;
+
                 if(message.equals("_ping_")){
                     conn.send(connections.size() + "|" + Vars.player.name);
+                    connections.remove(k);
                 }else {
                     if (debug) UCore.log("Got message: " + message);
-                    KryoConnection k = getBySocket(conn);
-                    if (k == null) return;
 
                     byte[] out = Base64Coder.decode(message);
                     if (debug) UCore.log("Decoded: " + Arrays.toString(out));
@@ -409,6 +414,10 @@ public class KryoServer implements ServerProvider {
         public void onError(WebSocket conn, Exception ex) {
             UCore.log("WS error:");
             ex.printStackTrace();
+            if(ex instanceof BindException){
+                Net.closeServer();
+                Vars.ui.showError("$text.server.addressinuse");
+            }
         }
 
         @Override