diff --git a/core/assets/version.properties b/core/assets/version.properties index b92a747b63..fd05abb841 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,5 +1,5 @@ #Autogenerated file. Do not modify. -#Mon Feb 19 14:31:15 EST 2018 +#Mon Feb 19 14:44:36 EST 2018 version=beta androidBuildCode=245 name=Mindustry diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index a2cb6033ab..97d037ec44 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -350,6 +350,7 @@ public class NetClient extends Module { ui.join.hide(); Net.setClientLoaded(true); Timers.runTask(1f, () -> Net.send(new ConnectConfirmPacket(), SendMode.tcp)); + Timers.runTask(40f, Platform.instance::updateRPC); } public void beginConnecting(){ diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index d32181931c..6473924085 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/io/anuke/mindustry/net/Net.java @@ -68,8 +68,6 @@ public class Net{ clientProvider.connect(ip, port); active = true; server = false; - - Timers.runTask(60f, Platform.instance::updateRPC); }else{ throw new IOException("Already connected!"); } diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java index b119bdd820..9b6132e8ce 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java @@ -65,9 +65,10 @@ public class DesktopPlatform extends Platform { presence.state = Strings.capitalize(state.mode.name()) + ", Solo"; presence.details = Strings.capitalize(world.getMap().name) + " | Wave " + state.wave; presence.largeImageText = "Wave " + state.wave; - if(Net.active() ){ + + if(Net.active()){ presence.partyMax = 16; - presence.partySize = Net.getConnections().size; + presence.partySize = playerGroup.size(); presence.state = Strings.capitalize(state.mode.name()); } }else{