Merge pull request #257 from SpigotMC/master

Minecraft 1.14.2 support
HexagonMC · May 28, 2019 · a53be5e · a53be5e
2 parents db8c11f + 8fda060
commit a53be5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
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
@@ -23,6 +23,7 @@ public class ProtocolConstants
     public static final int MINECRAFT_1_13_2 = 404;
     public static final int MINECRAFT_1_14 = 477;
     public static final int MINECRAFT_1_14_1 = 480;
+    public static final int MINECRAFT_1_14_2 = 485;
     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
             "1.7.x",
             "1.8.x",
@@ -51,7 +52,8 @@ public class ProtocolConstants
             ProtocolConstants.MINECRAFT_1_13_1,
             ProtocolConstants.MINECRAFT_1_13_2,
             ProtocolConstants.MINECRAFT_1_14,
-            ProtocolConstants.MINECRAFT_1_14_1
+            ProtocolConstants.MINECRAFT_1_14_1,
+            ProtocolConstants.MINECRAFT_1_14_2
     );
 
     public enum Direction

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