diff --git a/pom.xml b/pom.xml index ff92bf1e4..73b51d497 100644 --- a/pom.xml +++ b/pom.xml @@ -68,8 +68,8 @@ unknown 4.1.45.Final - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 @@ -77,13 +77,13 @@ junit junit - 4.12 + 4.13 test com.google.guava guava - 20.0 + 21.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 b91d191e2..ad587d286 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 @@ -27,6 +27,7 @@ public class ProtocolConstants public static final int MINECRAFT_1_14_4 = 498; public static final int MINECRAFT_1_15 = 573; public static final int MINECRAFT_1_15_1 = 575; + public static final int MINECRAFT_1_15_2 = 578; public static final List SUPPORTED_VERSIONS = Arrays.asList( "1.8.x", "1.9.x", @@ -58,7 +59,8 @@ public class ProtocolConstants ProtocolConstants.MINECRAFT_1_14_3, ProtocolConstants.MINECRAFT_1_14_4, ProtocolConstants.MINECRAFT_1_15, - ProtocolConstants.MINECRAFT_1_15_1 + ProtocolConstants.MINECRAFT_1_15_1, + ProtocolConstants.MINECRAFT_1_15_2 ); public enum Direction diff --git a/proxy/pom.xml b/proxy/pom.xml index 97a75125b..04c5af432 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -87,7 +87,7 @@ net.sf.jopt-simple jopt-simple - 4.9 + 5.0.4 compile diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java index 60e2889c7..0d7a6d83d 100644 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java @@ -58,6 +58,7 @@ public abstract class EntityMap return EntityMap_1_14.INSTANCE; case ProtocolConstants.MINECRAFT_1_15: case ProtocolConstants.MINECRAFT_1_15_1: + case ProtocolConstants.MINECRAFT_1_15_2: return EntityMap_1_15.INSTANCE; } throw new RuntimeException( "Version " + version + " has no entity map" ); @@ -254,11 +255,11 @@ public abstract class EntityMap try { new NBTInputStream( new ByteBufInputStream( packet ), false ).readTag(); - } catch ( IOException ex ) - { - throw new RuntimeException( ex ); - } - break; + } catch ( IOException ex ) + { + throw new RuntimeException( ex ); + } + break; case 15: DefinedPacket.readVarInt( packet ); DefinedPacket.readVarInt( packet );