Merge remote-tracking branch 'origin/master'

2019-10-22 18:45:15 -04:00
parent 17e219f142 216e999a71
commit ae4ec55abe
6 changed files with 675 additions and 601 deletions
--- a/core/src/io/anuke/mindustry/core/NetClient.java
+++ b/core/src/io/anuke/mindustry/core/NetClient.java
@@ -198,6 +198,16 @@ public class NetClient implements ApplicationListener{
        return "[#" + player.color.toString().toUpperCase() + "]" + name;
    }

+    @Remote(called = Loc.client, variants = Variant.one)
+    public static void onConnect(String ip, int port){
+        netClient.disconnectQuietly();
+        state.set(State.menu);
+        logic.reset();
+
+        Vars.netClient.beginConnecting();
+        net.connect(ip, port, () -> {});
+    }
+    
    @Remote(targets = Loc.client)
    public static void onPing(Player player, long time){
        Call.onPingResponse(player.con, time);
@@ -479,4 +489,4 @@ public class NetClient implements ApplicationListener{
            return result;
        }
    }
-}
+}