Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-27 11:07:39 +01: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:
5aa8f70 Updated Upstream (BungeeCord)
61700eb Preliminary 1.16.3 support (#566)
This commit is contained in:
Shane Freeder 2020-09-11 00:47:38 +01:00
parent e92af6a3c7
commit 55f272fc4b
3 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 8075dbe95dbc5da9dd9fecd61263a5ce85d3c4e3 Subproject commit 5aa8f709bbae4356c02b75120477e4002d02b9e7

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

@ -1,4 +1,4 @@
From d0c1b725cdfa4e07a4a8f9bf6bb810290f4e361e Mon Sep 17 00:00:00 2001 From f7c69bedede5970d764bbd1e80f9849ffd63ff9e 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
@ -462,7 +462,7 @@ index d372933d..1feee418 100644
java.util.function.Supplier<? extends DefinedPacket> constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction java.util.function.Supplier<? extends DefinedPacket> constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction
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 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 aa1b770c..6f72983f 100644 index f33bb5c4..659382c0 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/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; @@ -6,6 +6,8 @@ import java.util.List;
@ -474,15 +474,15 @@ index aa1b770c..6f72983f 100644
public static final int MINECRAFT_1_8 = 47; public static final int MINECRAFT_1_8 = 47;
public static final int MINECRAFT_1_9 = 107; public static final int MINECRAFT_1_9 = 107;
public static final int MINECRAFT_1_9_1 = 108; public static final int MINECRAFT_1_9_1 = 108;
@@ -32,6 +34,7 @@ public class ProtocolConstants @@ -33,6 +35,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_2 = 751;
public static final int MINECRAFT_1_16_3 = 753;
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList( public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
+ "1.7.x", + "1.7.x",
"1.8.x", "1.8.x",
"1.9.x", "1.9.x",
"1.10.x", "1.10.x",
@@ -43,6 +46,8 @@ public class ProtocolConstants @@ -44,6 +47,8 @@ public class ProtocolConstants
"1.16.x" "1.16.x"
); );
public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList( public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
@ -1512,7 +1512,7 @@ index b0125245..8c2a743a 100644
{ {
this.compressionThreshold = compressionThreshold; this.compressionThreshold = compressionThreshold;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 44e6ed3f..585afa36 100644 index 443d19bd..326de178 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -20,6 +20,7 @@ import io.netty.buffer.Unpooled; @@ -20,6 +20,7 @@ import io.netty.buffer.Unpooled;
@ -1581,7 +1581,7 @@ index 44e6ed3f..585afa36 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 4b40b465..13deb6c9 100644 index 7e6027aa..fe6ff143 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; @@ -12,6 +12,13 @@ import java.util.List;
@ -2038,5 +2038,5 @@ index daf12f74..e33861ab 100644
@Override @Override
-- --
2.27.0 2.28.0

31
Waterfall-Proxy-Patches/0004-Travertine-1.16.3-Patch.patch
View File

@ -1,31 +0,0 @@
From e8c93c149c23d9d6d57acee204780c952a3394bf Mon Sep 17 00:00:00 2001
From: "Five (Xer)" <admin@xernium.com>
Date: Thu, 10 Sep 2020 17:59:48 +0200
Subject: [PATCH] Travertine-1.16.3-Patch
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 6f72983f..659382c0 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
@@ -33,6 +33,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_16 = 735;
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 List<String> SUPPORTED_VERSIONS = Arrays.asList(
"1.7.x",
"1.8.x",
@@ -72,7 +73,8 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_15_2,
ProtocolConstants.MINECRAFT_1_16,
ProtocolConstants.MINECRAFT_1_16_1,
- ProtocolConstants.MINECRAFT_1_16_2
+ ProtocolConstants.MINECRAFT_1_16_2,
+ ProtocolConstants.MINECRAFT_1_16_3
);
public static final boolean isBeforeOrEq(int before, int other)
--
2.24.0