From 629df465cbcabad99fafb2e929589b18963ced5d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 2 Dec 2020 19:13:52 +0000 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: e6b1b10 Brrrrr --- Waterfall | 2 +- .../0003-1.7.x-Protocol-Patch.patch | 25 ++++++++----------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Waterfall b/Waterfall index 85f0a0c..e6b1b10 160000 --- a/Waterfall +++ b/Waterfall @@ -1 +1 @@ -Subproject commit 85f0a0c69a5d1ffbf759ae5553a3b09d1f520eda +Subproject commit e6b1b105d08a0dddb0b78a99ce893c918683b9c7 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 4a8a6fe..735ee73 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 f9955fcb4091c2ede107ebc8a1c09848e933e839 Mon Sep 17 00:00:00 2001 +From 682bb544387936931880d662162b2fe107a4289b 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 @@ -1571,24 +1571,19 @@ index 9e180c30..d54d8539 100644 con.unsafe().sendPacket( pluginMessage ); throw CancelSendSignal.INSTANCE; diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -index 7e6027aa..fe6ff143 100644 +index b7ecd828..3b82219d 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java -@@ -12,6 +12,13 @@ import java.util.List; - import java.util.UUID; - import java.util.logging.Level; - import javax.crypto.SecretKey; -+ -+import com.google.common.base.Charsets; -+import com.google.common.base.Preconditions; -+import com.google.gson.Gson; -+ +@@ -3,6 +3,8 @@ package net.md_5.bungee.connection; + import com.google.common.base.Charsets; + import com.google.common.base.Preconditions; + import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; - import lombok.Getter; - import lombok.RequiredArgsConstructor; - import net.md_5.bungee.BungeeCord; -@@ -255,12 +262,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection + import java.math.BigInteger; + import java.net.InetSocketAddress; + import java.net.SocketAddress; +@@ -257,12 +259,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public void done(ProxyPingEvent pingResult, Throwable error) {