Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord) 

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
0509303f #3519: Queue configuration phase packets from API methods
f486a251 #3518: Bump io.netty:netty-bom from 4.1.97.Final to 4.1.98.Final
This commit is contained in:
Shane Freeder 2023-09-23 02:27:23 +01:00
parent 77a8bd1767
commit 42619795e1
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
12 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 5a1e342e0d500bfbab77dcfda24273e971a28b02
Subproject commit 0509303fd37c2b236c8a3b5f5cea85cada937ad2

6
BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
View File

@ -1,4 +1,4 @@
From 552edd40b9f52f222c23c278103f6dae84f3cf40 Mon Sep 17 00:00:00 2001
From 9862433d237c305eea0735ced32b5bac5a18a9b0 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled
@ -67,10 +67,10 @@ index 287a0545..7c3e9a29 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 9d2df335..65e942cd 100644
index c1c73aba..00c88e4d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -168,8 +168,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -170,8 +170,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this );

8
BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
View File

@ -1,4 +1,4 @@
From 026666cd0b61145f531a89fc9791b0d6bb608b9e Mon Sep 17 00:00:00 2001
From 49229d1749cebd2fbd7ce9f73925e2f88ba6d46c Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling
@ -73,10 +73,10 @@ index 741ebfde..91743f01 100644
+ }
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index d288b6f2..c301b033 100644
index 48a523c6..cfad8f53 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -47,6 +47,8 @@ public class UpstreamBridge extends PacketHandler
@@ -48,6 +48,8 @@ public class UpstreamBridge extends PacketHandler
private final ProxyServer bungee;
private final UserConnection con;
@ -85,7 +85,7 @@ index d288b6f2..c301b033 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -213,6 +215,20 @@ public class UpstreamBridge extends PacketHandler
@@ -214,6 +216,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{

6
BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From dd23fa1240254bbd39f7238ea37f873248f3c186 Mon Sep 17 00:00:00 2001
From 67b70e860e249dffbcb66046988fc0335bee1ef0 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Improve server list ping logging
@ -57,10 +57,10 @@ index 107ff484..68687242 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index c301b033..2038b9a8 100644
index cfad8f53..10df98ff 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -353,6 +353,6 @@ public class UpstreamBridge extends PacketHandler
@@ -362,6 +362,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{

8
BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch
View File

@ -1,14 +1,14 @@
From faa0558a5ed64dd66b2aca04bc6fa870ad237df6 Mon Sep 17 00:00:00 2001
From 63aadf49568d83f3bac3f19de86cd5f9e547c9ea Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 25 Oct 2016 12:34:41 -0400
Subject: [PATCH] Validate that chat messages are non-blank
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 2038b9a8..7bcd317e 100644
index 10df98ff..800c4a0d 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -190,6 +190,7 @@ public class UpstreamBridge extends PacketHandler
@@ -191,6 +191,7 @@ public class UpstreamBridge extends PacketHandler
private String handleChat(String message)
{
@ -16,7 +16,7 @@ index 2038b9a8..7bcd317e 100644
for ( int index = 0, length = message.length(); index < length; index++ )
{
char c = message.charAt( index );
@@ -197,8 +198,14 @@ public class UpstreamBridge extends PacketHandler
@@ -198,8 +199,14 @@ public class UpstreamBridge extends PacketHandler
{
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
throw CancelSendSignal.INSTANCE;

8
BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From 964bf7b3cf1b45a82b8ab24689bed4cbd549b968 Mon Sep 17 00:00:00 2001
From c7e03fafe03c044f0da356ac97c3b08d7b3d16c1 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods
@ -75,10 +75,10 @@ index c3848b3c..a441a424 100644
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 65e942cd..87eb9199 100644
index 00c88e4d..242b693e 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -258,9 +258,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -281,9 +281,20 @@ public final class UserConnection implements ProxiedPlayer
public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
{
@ -99,7 +99,7 @@ index 65e942cd..87eb9199 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -354,7 +365,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -377,7 +388,7 @@ public final class UserConnection implements ProxiedPlayer
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
sendMessage( bungee.getTranslation( "fallback_lobby" ) );

6
BungeeCord-Patches/0030-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From 42716f7bfd1552c1a7207293614d27d8105833d1 Mon Sep 17 00:00:00 2001
From d977b482d4497a46228913b145913aff3efe66df Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -117,7 +117,7 @@ index 00000000..7ed2dc3a
+ }
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 87eb9199..a129dc42 100644
index 242b693e..4d9db4de 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -1,7 +1,9 @@
@ -130,7 +130,7 @@ index 87eb9199..a129dc42 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -125,6 +127,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -126,6 +128,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard();
@Getter
private final Collection<UUID> sentBossBars = new HashSet<>();

6
BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From 8525fdb1e67b91ffd9d11342c505ecf351a29619 Mon Sep 17 00:00:00 2001
From 81af9ba73891328559c20a7ed62ac0ff72a4a8e6 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -122,10 +122,10 @@ index 2624dd37..55218447 100644
(byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index a129dc42..fe6eab9b 100644
index 4d9db4de..a25f9e79 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -778,4 +778,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -801,4 +801,10 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
}

12
BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch
View File

@ -1,4 +1,4 @@
From cf604e1b03d62a3c0914712ed056c9fb538c3de0 Mon Sep 17 00:00:00 2001
From 974b20b184e44b3610e6238526a934bbe1344976 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 16 Apr 2021 06:29:28 +0100
Subject: [PATCH] ServerConnectRequest#sendFeedback
@ -31,10 +31,10 @@ index c81b0a4e..d21370be 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index fe6eab9b..fc8df2b8 100644
index a25f9e79..c75e9bad 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -271,12 +271,16 @@ public final class UserConnection implements ProxiedPlayer
@@ -294,12 +294,16 @@ public final class UserConnection implements ProxiedPlayer
connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
}
@ -53,7 +53,7 @@ index fe6eab9b..fc8df2b8 100644
builder.connectTimeout(timeout); // Waterfall
if ( callback != null )
{
@@ -324,7 +328,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -347,7 +351,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
}
@ -62,7 +62,7 @@ index fe6eab9b..fc8df2b8 100644
return;
}
if ( pendingConnects.contains( target ) )
@@ -334,7 +338,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -357,7 +361,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
}
@ -71,7 +71,7 @@ index fe6eab9b..fc8df2b8 100644
return;
}
@@ -370,14 +374,14 @@ public final class UserConnection implements ProxiedPlayer
@@ -393,14 +397,14 @@ public final class UserConnection implements ProxiedPlayer
ServerInfo def = updateAndGetNextServer( target );
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{

6
BungeeCord-Patches/0059-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch
View File

@ -1,4 +1,4 @@
From e1c30dc6d176143f1f51a9e48636125f45ecb957 Mon Sep 17 00:00:00 2001
From 372e00bb354ee567d0d9d8c6831b99538f2224f8 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 22 Mar 2022 14:56:44 +0000
Subject: [PATCH] Don't send exceptions to the client during kicks, etc
@ -13,10 +13,10 @@ allows for retaining much of the overall context here, i.e. who
was this exception assocated with?
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index fc8df2b8..fb08c080 100644
index c75e9bad..cbc45c5c 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -402,7 +402,8 @@ public final class UserConnection implements ProxiedPlayer
@@ -425,7 +425,8 @@ public final class UserConnection implements ProxiedPlayer
private String connectionFailMessage(Throwable cause)
{

6
BungeeCord-Patches/0061-Add-protocol-version-to-packet-not-found-message.patch
View File

@ -1,4 +1,4 @@
From 6661c691eb2e99883a2468328adf15e5d2ea87cf Mon Sep 17 00:00:00 2001
From 7223638cd14c46a10da24716d163b72c129110ce Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 12 Jun 2022 06:45:54 +0100
Subject: [PATCH] Add protocol version to packet not found message
@ -6,7 +6,7 @@ Subject: [PATCH] Add protocol version to packet not found message
Also avoids a double get, but, this is probably trivial
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
index 5eb00df3..dd10c1e1 100644
index 7f001b11..82bfc51b 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -2,6 +2,8 @@ package net.md_5.bungee.protocol;
@ -18,7 +18,7 @@ index 5eb00df3..dd10c1e1 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -819,9 +821,12 @@ public enum Protocol
@@ -830,9 +832,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}

6
BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch
View File

@ -1,4 +1,4 @@
From 1dc384718469865083289a3c4239082c5a68f9ce Mon Sep 17 00:00:00 2001
From 0f6f4601d455713102ad18766199c7cfb53c8ca1 Mon Sep 17 00:00:00 2001
From: Janmm14 <gitconfig1@janmm14.de>
Date: Mon, 21 Jun 2021 23:43:39 +0200
Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
@ -32,10 +32,10 @@ index 377df7ec..8f531f85 100644
.handler( PipelineUtils.BASE_SERVERSIDE )
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index fb08c080..96f4d017 100644
index cbc45c5c..0281c393 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -387,7 +387,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -410,7 +410,7 @@ public final class UserConnection implements ProxiedPlayer
}
};
Bootstrap b = new Bootstrap()