Fixed server getting stuck when hosting

Anuken · Jan 12, 2018 · 77d8464 · 77d8464
1 parent 5fc5d7c
commit 77d8464
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
         appName = "Mindustry"
         gdxVersion = '1.9.8'
         aiVersion = '1.8.1'
-        uCoreVersion = '459e8ae';
+        uCoreVersion = '2254516';
     }
 
     repositories {

diff --git a/kryonet/src/io/anuke/kryonet/KryoServer.java b/kryonet/src/io/anuke/kryonet/KryoServer.java
@@ -46,9 +46,6 @@ public boolean onDiscoverHost(DatagramChannel datagramChannel, InetSocketAddress
             }
         });
 
-        Thread thread = new Thread(server, "Kryonet Server");
-        thread.setDaemon(true);
-        thread.start();
         server.addListener(new Listener(){
 
             @Override
@@ -125,11 +122,17 @@ public void kick(int connection) {
     @Override
     public void host(int port) throws IOException {
         server.bind(port, port);
+
+        Thread thread = new Thread(server, "Kryonet Server");
+        thread.setDaemon(true);
+        thread.start();
     }
 
     @Override
     public void close() {
-        server.close();
+        UCore.setPrivate(server, "shutdown", true);
+
+        new Thread(() -> server.close()).run();
     }
 
     @Override