Preliminary 1.16.4 protocol support

This build has not been tested bar outside of typical smoke testing, however,
the changes in 1.16.4 to the protocol are virtually inexistant and should
have no bearing on stability, RUN AT YOUR OWN RISK, however.
This commit is contained in:
Shane Freeder 2020-11-02 19:03:54 +00:00
parent a2d39aed4d
commit 72503bfab4

View File

@ -0,0 +1,43 @@
From d415b9e85fe6e7fc17328ce06e31faa276cb545e Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 2 Nov 2020 19:02:31 +0000
Subject: [PATCH] Preliminary 1.16.4 protocol support
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 f33bb5c4..30b4d059 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
@@ -32,6 +32,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_16_1 = 736;
public static final int MINECRAFT_1_16_2 = 751;
public static final int MINECRAFT_1_16_3 = 753;
+ public static final int MINECRAFT_1_16_4 = 754; // Waterfall
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
"1.8.x",
"1.9.x",
@@ -69,7 +70,8 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_16,
ProtocolConstants.MINECRAFT_1_16_1,
ProtocolConstants.MINECRAFT_1_16_2,
- ProtocolConstants.MINECRAFT_1_16_3
+ ProtocolConstants.MINECRAFT_1_16_3, // Waterfall
+ ProtocolConstants.MINECRAFT_1_16_4 // Waterfall
);
public static final boolean isBeforeOrEq(int before, int other)
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 a5acf512..84c20c68 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
@@ -72,6 +72,7 @@ public abstract class EntityMap
return EntityMap_1_16.INSTANCE;
case ProtocolConstants.MINECRAFT_1_16_2:
case ProtocolConstants.MINECRAFT_1_16_3:
+ case ProtocolConstants.MINECRAFT_1_16_4: // Waterfall
return EntityMap_1_16_2.INSTANCE;
}
throw new RuntimeException( "Version " + version + " has no entity map" );
--
2.28.0