From 29deb8df30b5b3b8721fe0321b7ec725ec40526c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 23 Apr 2019 18:57:42 +0100 Subject: [PATCH] Updated Upstream (Waterfall) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes: 154eb18 Bring up waterfall to 1.14 release --- Waterfall | 2 +- Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Waterfall b/Waterfall index 69d0c40..154eb18 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 69d0c4010d265918b8f1ae62fae99babc2058ce2 +Subproject commit 154eb184b6e74c6a6f3f98cf180f7db96d8f7f10 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 91704e0..746a6d7 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 9e835b90ac238b415a33770923b49446999f9385 Mon Sep 17 00:00:00 2001 +From 83f505362db5c470582941de59a0ccff3c40c80f 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 3a319cff..6ccfdcf1 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 fb583238..67c3ef1e 100644 +index a0c0b5ca..4c3df5fb 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; @@ -459,7 +459,7 @@ index fb583238..67c3ef1e 100644 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; - public static final int MINECRAFT_1_14 = 476; + public static final int MINECRAFT_1_14 = 477; public static final List SUPPORTED_VERSIONS = Arrays.asList( + "1.7.x", "1.8.x",