Merge pull request #262 from SpigotMC/master

Merge with upstream
HexagonMC · Jul 24, 2019 · f249233 · f249233
2 parents 368028c + 5c6bc18
commit f249233
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
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
@@ -25,6 +25,7 @@ public class ProtocolConstants
     public static final int MINECRAFT_1_14_1 = 480;
     public static final int MINECRAFT_1_14_2 = 485;
     public static final int MINECRAFT_1_14_3 = 490;
+    public static final int MINECRAFT_1_14_4 = 498;
     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
             "1.7.x",
             "1.8.x",
@@ -55,7 +56,8 @@ public class ProtocolConstants
             ProtocolConstants.MINECRAFT_1_14,
             ProtocolConstants.MINECRAFT_1_14_1,
             ProtocolConstants.MINECRAFT_1_14_2,
-            ProtocolConstants.MINECRAFT_1_14_3
+            ProtocolConstants.MINECRAFT_1_14_3,
+            ProtocolConstants.MINECRAFT_1_14_4
     );
 
     public enum Direction

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Commands.java
@@ -357,7 +357,7 @@ protected FloatArgumentType read(ByteBuf buf)
             {
                 byte flags = buf.readByte();
                 float min = ( flags & 0x1 ) != 0 ? buf.readFloat() : -Float.MAX_VALUE;
-                float max = ( flags & 0x2 ) != 0 ? buf.readFloat() : -Float.MAX_VALUE;
+                float max = ( flags & 0x2 ) != 0 ? buf.readFloat() : Float.MAX_VALUE;
 
                 return FloatArgumentType.floatArg( min, max );
             }
@@ -386,7 +386,7 @@ protected DoubleArgumentType read(ByteBuf buf)
             {
                 byte flags = buf.readByte();
                 double min = ( flags & 0x1 ) != 0 ? buf.readDouble() : -Double.MAX_VALUE;
-                double max = ( flags & 0x2 ) != 0 ? buf.readDouble() : -Double.MAX_VALUE;
+                double max = ( flags & 0x2 ) != 0 ? buf.readDouble() : Double.MAX_VALUE;
 
                 return DoubleArgumentType.doubleArg( min, max );
             }

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
@@ -59,6 +59,7 @@ public static EntityMap getEntityMap(int version)
             case ProtocolConstants.MINECRAFT_1_14_1:
             case ProtocolConstants.MINECRAFT_1_14_2:
             case ProtocolConstants.MINECRAFT_1_14_3:
+            case ProtocolConstants.MINECRAFT_1_14_4:
                 return EntityMap_1_14.INSTANCE;
         }
         throw new RuntimeException( "Version " + version + " has no entity map" );