diff --git a/Waterfall b/Waterfall index 4b911e4..b65f2c9 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 4b911e471bbb39771da5af9423a112ae1f635607 +Subproject commit b65f2c9395df6108ba92863675fae8f82c94a566 diff --git a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch index e6102e3..eecdb8f 100644 --- a/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch +++ b/Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch @@ -1,4 +1,4 @@ -From 08054bd793048b764e3167ff743eb8a1b342e21e Mon Sep 17 00:00:00 2001 +From 9ee4e7a7891b68a57705cd91ba5b62e3f11201e7 Mon Sep 17 00:00:00 2001 From: Troy Frew Date: Tue, 15 Nov 2016 10:31:04 -0500 Subject: [PATCH] 1.7.x Protocol Patch @@ -445,7 +445,7 @@ index 87093807..fd5642e4 100644 Constructor constructor = protocolData.packetConstructors[id]; 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 a0c0b5ca..4c3df5fb 100644 +index eea7ed98..3ed80bec 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 @@ -6,6 +6,8 @@ import java.util.List; @@ -457,15 +457,15 @@ index a0c0b5ca..4c3df5fb 100644 public static final int MINECRAFT_1_8 = 47; public static final int MINECRAFT_1_9 = 107; public static final int MINECRAFT_1_9_1 = 108; -@@ -22,6 +24,7 @@ public class ProtocolConstants - public static final int MINECRAFT_1_13_2 = 404; +@@ -23,6 +25,7 @@ public class ProtocolConstants public static final int MINECRAFT_1_14 = 477; + public static final int MINECRAFT_1_14_1 = 480; public static final List SUPPORTED_VERSIONS = Arrays.asList( + "1.7.x", "1.8.x", "1.9.x", "1.10.x", -@@ -31,6 +34,8 @@ public class ProtocolConstants +@@ -32,6 +35,8 @@ public class ProtocolConstants "1.14.x" ); public static final List SUPPORTED_VERSION_IDS = Arrays.asList( @@ -1625,7 +1625,7 @@ index 51d0c6cf..35b9530a 100644 con.getServer().disconnect( "Quitting" ); } 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 f1ed6050..6ccea5d0 100644 +index 6ebbc04b..c3b23825 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 @@ -29,6 +29,10 @@ public abstract class EntityMap @@ -1994,5 +1994,5 @@ index daf12f74..e33861ab 100644 @Override -- -2.21.0 +2.20.1 (Apple Git-117)