diff --git a/chat/pom.xml b/chat/pom.xml index dc097e11..970e3097 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -27,7 +27,7 @@ com.google.code.gson gson - 2.3.1 + 2.8.0 compile diff --git a/config/pom.xml b/config/pom.xml index ac980914..253bfdff 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -22,7 +22,7 @@ org.yaml snakeyaml - 1.14 + 1.18 compile diff --git a/pom.xml b/pom.xml index c817bcfa..f96997a5 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ com.google.guava guava - 18.0 + 20.0 compile diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java index 856fac6b..caa77637 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java @@ -14,7 +14,7 @@ public class ProtocolConstants public static final int MINECRAFT_1_10 = 210; public static final int MINECRAFT_1_11 = 315; public static final int MINECRAFT_1_11_1 = 316; - public static final int MINECRAFT_1_12 = 333; + public static final int MINECRAFT_1_12 = 335; public static final List SUPPORTED_VERSIONS = Arrays.asList( "1.8.x", "1.9.x", diff --git a/proxy/pom.xml b/proxy/pom.xml index d2e864b2..48c13305 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -77,13 +77,7 @@ mysql mysql-connector-java - 5.1.40 - runtime - - - org.javassist - javassist - 3.20.0-GA + 5.1.42 runtime diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java index f31faa99..653a4720 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -597,7 +597,7 @@ public class BungeeCord extends ProxyServer @Override public String getGameVersion() { - return Joiner.on( ", " ).join( ProtocolConstants.SUPPORTED_VERSIONS ); + return ProtocolConstants.SUPPORTED_VERSIONS.get( 0 ) + "-" + ProtocolConstants.SUPPORTED_VERSIONS.get( ProtocolConstants.SUPPORTED_VERSIONS.size() - 1 ); } @Override