From e30347a11f0f02217d82b3c3f77638e08841fa81 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 3 Nov 2018 09:00:21 -0400
Subject: [PATCH] Fixed world data not loading on mobile servers

---
 core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java | 6 +-----
 kryonet/src/io/anuke/kryonet/KryoServer.java           | 9 +++++----
 tools/src/io/anuke/mindustry/BundleLauncher.java       | 6 +++---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
index c7048c46ab..9bcee6223a 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
@@ -18,7 +18,6 @@ import io.anuke.ucore.scene.ui.layout.Cell;
 import io.anuke.ucore.scene.ui.layout.Table;
 import io.anuke.ucore.scene.utils.UIUtils;
 import io.anuke.ucore.util.Bundles;
-import io.anuke.ucore.util.Log;
 import io.anuke.ucore.util.Strings;
 
 import static io.anuke.mindustry.Vars.*;
@@ -252,10 +251,7 @@ public class JoinDialog extends FloatingDialog{
 
         local.clear();
         local.background((Drawable)null);
-        local.table("button", t -> {
-            t.label(() -> "[accent]" + Bundles.get("text.hosts.discovering") + Strings.animated(4, 10f, ".")).pad(10f);
-        }).growX();
-        Log.info("begin of discover");
+        local.table("button", t -> t.label(() -> "[accent]" + Bundles.get("text.hosts.discovering") + Strings.animated(4, 10f, ".")).pad(10f)).growX();
         Net.discoverServers(this::addLocalHost, this::finishLocalHosts);
     }
 
diff --git a/kryonet/src/io/anuke/kryonet/KryoServer.java b/kryonet/src/io/anuke/kryonet/KryoServer.java
index d1a3e12b5f..fc8882da9c 100644
--- a/kryonet/src/io/anuke/kryonet/KryoServer.java
+++ b/kryonet/src/io/anuke/kryonet/KryoServer.java
@@ -1,6 +1,5 @@
 package io.anuke.kryonet;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.utils.Array;
 import com.dosse.upnp.UPnP;
 import com.esotericsoftware.kryonet.Connection;
@@ -28,6 +27,8 @@ import java.nio.channels.ClosedSelectorException;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import static io.anuke.mindustry.Vars.threads;
+
 public class KryoServer implements ServerProvider {
     final boolean tcpOnly = System.getProperty("java.version") == null;
     final Server server;
@@ -65,7 +66,7 @@ public class KryoServer implements ServerProvider {
                 Log.info("&bRecieved connection: {0} / {1}. Kryonet ID: {2}", c.id, c.addressTCP, connection.getID());
 
                 connections.add(kn);
-                Gdx.app.postRunnable(() -> Net.handleServerReceived(kn.id, c));
+                threads.runDelay(() -> Net.handleServerReceived(kn.id, c));
             }
 
             @Override
@@ -79,7 +80,7 @@ public class KryoServer implements ServerProvider {
 
                 Log.info("&bLost connection: {0}", k.id);
 
-                Gdx.app.postRunnable(() -> {
+                threads.runDelay(() -> {
                     Net.handleServerReceived(k.id, c);
                     connections.remove(k);
                 });
@@ -90,7 +91,7 @@ public class KryoServer implements ServerProvider {
                 KryoConnection k = getByKryoID(connection.getID());
                 if(object instanceof FrameworkMessage || k == null) return;
 
-                Gdx.app.postRunnable(() -> {
+                threads.runDelay(() -> {
                     try{
                         Net.handleServerReceived(k.id, object);
                     }catch (Exception e){
diff --git a/tools/src/io/anuke/mindustry/BundleLauncher.java b/tools/src/io/anuke/mindustry/BundleLauncher.java
index 9824b27ece..a423370b33 100644
--- a/tools/src/io/anuke/mindustry/BundleLauncher.java
+++ b/tools/src/io/anuke/mindustry/BundleLauncher.java
@@ -10,7 +10,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -30,7 +30,7 @@ public class BundleLauncher {
                 Log.info("Parsing bundle: {0}", child);
 
                 OrderedMap<String, String> other = new OrderedMap<>();
-                PropertiesUtils.load(other, Files.newBufferedReader(child, Charset.forName("UTF-8")));
+                PropertiesUtils.load(other, Files.newBufferedReader(child, StandardCharsets.UTF_8));
                 removals.clear();
 
                 for(String key : other.orderedKeys()){
@@ -63,7 +63,7 @@ public class BundleLauncher {
                     result.append((e.key + " = " + e.value).replace("\\", "\\\\").replace("\n", "\\n"));
                     result.append("\n");
                 }
-                Files.write(child, result.toString().getBytes("UTF-8"));
+                Files.write(child, result.toString().getBytes(StandardCharsets.UTF_8));
 
             }catch (IOException e){
                 throw new RuntimeException(e);