From 671710f4e2255776ebe6de5889f2caff5d5b9f9e Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 26 Oct 2012 17:53:07 +1100 Subject: [PATCH] Update for 1.4. Please note this is really messed and doesn't seem to work. --- pom.xml | 2 +- src/main/java/net/md_5/bungee/Configuration.java | 8 ++++++++ src/main/java/net/md_5/bungee/InitialHandler.java | 8 +++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6e9a6684..bca7f8de 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ net.md-5 mendax - 1.3-SNAPSHOT + 1.4.2-SNAPSHOT org.bouncycastle diff --git a/src/main/java/net/md_5/bungee/Configuration.java b/src/main/java/net/md_5/bungee/Configuration.java index 4593d2e5..36d6f3ea 100644 --- a/src/main/java/net/md_5/bungee/Configuration.java +++ b/src/main/java/net/md_5/bungee/Configuration.java @@ -54,6 +54,14 @@ public class Configuration * Server ping motd. */ public String motd = "BungeeCord Proxy Instance"; + /** + * Server protocol version. + */ + public int protcolVersion = 47; + /** + * Server game version. + */ + public String gameVersion = "1.4.2"; /** * Name of default server. */ diff --git a/src/main/java/net/md_5/bungee/InitialHandler.java b/src/main/java/net/md_5/bungee/InitialHandler.java index 6db5ebfa..724f1dfb 100644 --- a/src/main/java/net/md_5/bungee/InitialHandler.java +++ b/src/main/java/net/md_5/bungee/InitialHandler.java @@ -77,7 +77,13 @@ public class InitialHandler implements Runnable userCon.connect(BungeeCord.instance.config.getServer(handshake.username, handshake.host)); break; case 0xFE: - throw new KickException(BungeeCord.instance.config.motd + ChatColor.COLOR_CHAR + BungeeCord.instance.connections.size() + ChatColor.COLOR_CHAR + BungeeCord.instance.config.maxPlayers); + Configuration conf = BungeeCord.instance.config; + throw new KickException(ChatColor.COLOR_CHAR + "1" + + "\00" + conf.protcolVersion + + "\00" + conf.gameVersion + + "\00" + conf.motd + + "\00" + BungeeCord.instance.connections.size() + + "\00" + conf.maxPlayers); default: throw new IllegalArgumentException("Wasn't ready for packet id " + Util.hex(id)); }