From 05f7bc256b63cf736c3120ef1247cc821a1a6b57 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 17 Feb 2018 13:21:22 -0500 Subject: [PATCH] Made server send wave and map data on websocket ping --- core/assets/version.properties | 2 +- kryonet/src/io/anuke/kryonet/KryoServer.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/assets/version.properties b/core/assets/version.properties index 60ca26ce8a..227c87ae47 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,5 +1,5 @@ #Autogenerated file. Do not modify. -#Sat Feb 17 11:08:49 EST 2018 +#Sat Feb 17 13:20:56 EST 2018 version=beta androidBuildCode=234 name=Mindustry diff --git a/kryonet/src/io/anuke/kryonet/KryoServer.java b/kryonet/src/io/anuke/kryonet/KryoServer.java index ecec70f472..91ca98b82f 100644 --- a/kryonet/src/io/anuke/kryonet/KryoServer.java +++ b/kryonet/src/io/anuke/kryonet/KryoServer.java @@ -38,6 +38,8 @@ import java.nio.channels.ClosedSelectorException; import java.util.concurrent.CopyOnWriteArrayList; import static io.anuke.mindustry.Vars.headless; +import static io.anuke.mindustry.Vars.state; +import static io.anuke.mindustry.Vars.world; public class KryoServer implements ServerProvider { final boolean debug = false; @@ -423,7 +425,8 @@ public class KryoServer implements ServerProvider { if (k == null) return; if(message.equals("_ping_")){ - conn.send("---" + Vars.playerGroup.size() + "|" + (headless ? "Server" : Vars.player.name)); + conn.send("---" + Vars.playerGroup.size() + "|" + (headless ? "Server" : Vars.player.name) + + "|" + world.getMap().name + "|" + state.wave); connections.remove(k); }else { byte[] out = Base64Coder.decode(message);