Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-10-01 07:57:31 +02:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

Browse Source 
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
This commit is contained in:
Shane Freeder 2020-12-02 19:13:52 +00:00
parent 1866a16c0f
commit 629df465cb
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 85f0a0c69a5d1ffbf759ae5553a3b09d1f520eda Subproject commit e6b1b105d08a0dddb0b78a99ce893c918683b9c7

25
Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
View File

@ -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 <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 10:31:04 -0500 Date: Tue, 15 Nov 2016 10:31:04 -0500
Subject: [PATCH] 1.7.x Protocol Patch Subject: [PATCH] 1.7.x Protocol Patch
@ -1571,24 +1571,19 @@ index 9e180c30..d54d8539 100644
con.unsafe().sendPacket( pluginMessage ); con.unsafe().sendPacket( pluginMessage );
throw CancelSendSignal.INSTANCE; 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 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 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/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; @@ -3,6 +3,8 @@ package net.md_5.bungee.connection;
import java.util.UUID; import com.google.common.base.Charsets;
import java.util.logging.Level; import com.google.common.base.Preconditions;
import javax.crypto.SecretKey; import com.google.gson.Gson;
+
+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.JsonElement;
+import com.google.gson.JsonObject; +import com.google.gson.JsonObject;
import lombok.Getter; import java.math.BigInteger;
import lombok.RequiredArgsConstructor; import java.net.InetSocketAddress;
import net.md_5.bungee.BungeeCord; import java.net.SocketAddress;
@@ -255,12 +262,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -257,12 +259,28 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override @Override
public void done(ProxyPingEvent pingResult, Throwable error) public void done(ProxyPingEvent pingResult, Throwable error)
{ {