Skip to content

Commit ecc3b67

Browse files
committed
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: c820b3a0 Minecraft 1.21.5 support 687c3026 Add WriteTimeoutHandler 4b026231 #3805: Remove redundant PluginMessage handler in InitialHandler 6f13c2d6 Minecraft 1.21.5-rc1 protocol support cd186999 Minecraft 1.21.5-pre3 protocol support e3c7fd8c #3801: Add support for 1.21.5-pre2 9476ffcc #3797: Expose sendPacketQueued to unsafe interface 47f8c29a Minecraft 25w10a protocol support 45824650 Don't attempt to read packets after channel is closed/closing 362bd0f4 #3794: Ensure listType is set to compound tag when wrapping tags 598d73e6 Minecraft 25w09b protocol support
1 parent cc94a93 commit ecc3b67

16 files changed

+82
-78
lines changed

BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8b6edc385e31ebc6fb3ad2712c3108d28e345a0b Mon Sep 17 00:00:00 2001
1+
From 3a9942fcde49e8cb04db7f5486c4d0a5077cd2f5 Mon Sep 17 00:00:00 2001
22
From: Tux <write@imaginarycode.com>
33
Date: Thu, 19 May 2016 11:28:45 -0700
44
Subject: [PATCH] Rename references from BungeeCord to Waterfall
@@ -88,10 +88,10 @@ index efe048c9..720d0c3b 100644
8888
}
8989
}
9090
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
91-
index d659a138..3f2c82b2 100644
91+
index 95781e33..18ecdee1 100644
9292
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
9393
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
94-
@@ -216,7 +216,7 @@ public class YamlConfig implements ConfigurationAdapter
94+
@@ -218,7 +218,7 @@ public class YamlConfig implements ConfigurationAdapter
9595
Map<String, Object> val = entry.getValue();
9696
String name = entry.getKey();
9797
String addr = get( "address", "localhost:25565", val );
@@ -101,5 +101,5 @@ index d659a138..3f2c82b2 100644
101101
SocketAddress address = Util.getAddr( addr );
102102
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
103103
--
104-
2.47.1.windows.2
104+
2.43.0
105105

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From e6babfb5cf01befc88b60416cfcce8121cfa5c31 Mon Sep 17 00:00:00 2001
1+
From 2868a4fd7f7f3b782f671c171b19aedc0e4ed83a Mon Sep 17 00:00:00 2001
22
From: Troy Frew <fuzzy_bot@arenaga.me>
33
Date: Tue, 15 Nov 2016 09:07:51 -0500
44
Subject: [PATCH] Fixup ProtocolConstants
55

66

77
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
8-
index 1d0de625..fb356a66 100644
8+
index 976ee797..05e75c02 100644
99
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
1010
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
11-
@@ -126,6 +126,16 @@ public class ProtocolConstants
11+
@@ -127,6 +127,16 @@ public class ProtocolConstants
1212
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
1313
}
1414

@@ -26,5 +26,5 @@ index 1d0de625..fb356a66 100644
2626
{
2727

2828
--
29-
2.47.1.windows.2
29+
2.43.0
3030

BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2dc230ec020d7ca2631a74149e6aea7bb3ce0509 Mon Sep 17 00:00:00 2001
1+
From ed6135c3e301778325430c9ca18fc642857a29f8 Mon Sep 17 00:00:00 2001
22
From: Techcable <Techcable@techcable.net>
33
Date: Tue, 3 May 2016 20:31:52 -0700
44
Subject: [PATCH] Don't access a ByteBuf's underlying array
@@ -71,10 +71,10 @@ index 64e9a764..f5b3f7a8 100644
7171
// changes in the packet are ignored so we need to send it manually
7272
con.unsafe().sendPacket( pluginMessage );
7373
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
74-
index 2934cdef..91c1fbdb 100644
74+
index d9536149..9b7c15e1 100644
7575
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
7676
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
77-
@@ -55,7 +55,7 @@ import net.md_5.bungee.util.PacketLimiter;
77+
@@ -56,7 +56,7 @@ import net.md_5.bungee.util.PacketLimiter;
7878
public class PipelineUtils
7979
{
8080

@@ -84,5 +84,5 @@ index 2934cdef..91c1fbdb 100644
8484
private static void setChannelInitializerHolders()
8585
{
8686
--
87-
2.47.1.windows.2
87+
2.43.0
8888

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5a018520e9c84869b359a016f654807df4ffdb1b Mon Sep 17 00:00:00 2001
1+
From e0e270087fa050c4f527636df4b34c2f01f24519 Mon Sep 17 00:00:00 2001
22
From: Daniel Naylor <git@drnaylor.co.uk>
33
Date: Tue, 25 Oct 2016 12:23:07 -0400
44
Subject: [PATCH] Add support for FML with IP Forwarding enabled
@@ -67,10 +67,10 @@ index 33c2c8ab..86b4b8ed 100644
6767
}
6868

6969
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
70-
index 6d661494..caf9ff72 100644
70+
index 74ca0ac4..1dc6be5d 100644
7171
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
7272
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
73-
@@ -169,9 +169,12 @@ public final class UserConnection implements ProxiedPlayer
73+
@@ -181,9 +181,12 @@ public final class UserConnection implements ProxiedPlayer
7474

7575
forgeClientHandler = new ForgeClientHandler( this );
7676

@@ -101,5 +101,5 @@ index 6dca2048..f5253b89 100644
101101
* The FML 1.8 handshake token.
102102
*/
103103
--
104-
2.47.1.windows.2
104+
2.43.0
105105

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
From c891af89605c3bbb17eacb0665ea38c3b85cbd7b Mon Sep 17 00:00:00 2001
1+
From 20cf796d241a847a0ec647ceb324715e368c9571 Mon Sep 17 00:00:00 2001
22
From: Harry <me@harry5573.uk>
33
Date: Sun, 24 Jan 2016 15:13:29 -0700
44
Subject: [PATCH] Enable TCP_NODELAY.
55

66
This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
77

88
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
9-
index 91c1fbdb..f00a1a6c 100644
9+
index 9b7c15e1..77a458cc 100644
1010
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
1111
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
12-
@@ -215,6 +215,7 @@ public class PipelineUtils
12+
@@ -217,6 +217,7 @@ public class PipelineUtils
1313
{
1414
// IP_TOS is not supported (Windows XP / Windows Server 2003)
1515
}
@@ -18,5 +18,5 @@ index 91c1fbdb..f00a1a6c 100644
1818
ch.config().setWriteBufferWaterMark( MARK );
1919

2020
--
21-
2.47.1.windows.2
21+
2.43.0
2222

BungeeCord-Patches/0021-Better-Decompression-Sanity.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From fe053c35a3ec0f28a3a3d3db36e307aa3838f6a2 Mon Sep 17 00:00:00 2001
1+
From 1b402003afefb5ce50fb4bfdbd98949fa77af452 Mon Sep 17 00:00:00 2001
22
From: Techcable <Techcable@techcable.net>
33
Date: Fri, 18 Mar 2016 10:53:24 -0700
44
Subject: [PATCH] Better Decompression Sanity
@@ -49,10 +49,10 @@ index 1612ffcf..7fa07031 100644
4949
out.add( decompressed );
5050
decompressed = null;
5151
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
52-
index a3c6c8c4..909941d9 100644
52+
index cdad6d9e..f19e0cd8 100644
5353
--- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
5454
+++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
55-
@@ -190,7 +190,7 @@ public class ChannelWrapper
55+
@@ -196,7 +196,7 @@ public class ChannelWrapper
5656

5757
if ( decompressor == null )
5858
{
@@ -62,5 +62,5 @@ index a3c6c8c4..909941d9 100644
6262
} else
6363
{
6464
--
65-
2.47.1.windows.2
65+
2.43.0
6666

BungeeCord-Patches/0026-Add-timeout-variant-to-connect-methods.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f9a96ba44d4fb008cc2c3bc01008b2b24aba14a5 Mon Sep 17 00:00:00 2001
1+
From 074000f7772ce6f9ad6489375189ac665faf2271 Mon Sep 17 00:00:00 2001
22
From: Ichbinjoe <joe@ibj.io>
33
Date: Sat, 16 Jul 2016 20:44:01 -0400
44
Subject: [PATCH] Add timeout variant to connect methods
@@ -75,10 +75,10 @@ index 0fe647b8..32af4937 100644
7575
* Connects / transfers this user to the specified connection, gracefully
7676
* closing the current one. Depending on the implementation, this method
7777
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
78-
index caf9ff72..fd7d8799 100644
78+
index 1dc6be5d..92a7ef49 100644
7979
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
8080
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
81-
@@ -295,9 +295,20 @@ public final class UserConnection implements ProxiedPlayer
81+
@@ -309,9 +309,20 @@ public final class UserConnection implements ProxiedPlayer
8282

8383
public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
8484
{
@@ -99,7 +99,7 @@ index caf9ff72..fd7d8799 100644
9999
if ( callback != null )
100100
{
101101
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
102-
@@ -381,7 +392,7 @@ public final class UserConnection implements ProxiedPlayer
102+
@@ -395,7 +406,7 @@ public final class UserConnection implements ProxiedPlayer
103103
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
104104
{
105105
sendMessage( bungee.getTranslation( "fallback_lobby" ) );
@@ -109,5 +109,5 @@ index caf9ff72..fd7d8799 100644
109109
{
110110
disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
111111
--
112-
2.47.1.windows.2
112+
2.43.0
113113

BungeeCord-Patches/0043-Provide-an-option-to-disable-entity-metadata-rewriti.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a2919077766da5737ed63f8231f4f979f1bce3a9 Mon Sep 17 00:00:00 2001
1+
From ddad357e50bc6a08e5931d893aaaaf6360d94258 Mon Sep 17 00:00:00 2001
22
From: Shane Freeder <theboyetronic@gmail.com>
33
Date: Mon, 14 Jan 2019 03:35:21 +0000
44
Subject: [PATCH] Provide an option to disable entity metadata rewriting
@@ -123,10 +123,10 @@ index 6d0ab7bd..0b82fee9 100644
123123
(byte) 0, login.getDeathLocation(), login.getPortalCooldown(), login.getSeaLevel() ) );
124124
if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
125125
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
126-
index 7eda8f16..e5d06305 100644
126+
index f68041db..372b95e1 100644
127127
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
128128
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
129-
@@ -823,4 +823,9 @@ public final class UserConnection implements ProxiedPlayer
129+
@@ -837,4 +837,9 @@ public final class UserConnection implements ProxiedPlayer
130130

131131
unsafe().sendPacket( new Transfer( host, port ) );
132132
}
@@ -225,5 +225,5 @@ index 00000000..cb81d1dd
225225
+// Waterfall end
226226
\ No newline at end of file
227227
--
228-
2.47.1.windows.2
228+
2.43.0
229229

BungeeCord-Patches/0048-ConnectionInitEvent.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1b6e7ec801034651ea7d014e681405560724fd2f Mon Sep 17 00:00:00 2001
1+
From 3c213c03f7b9f05c9bbeeca056b6a816afb8117c Mon Sep 17 00:00:00 2001
22
From: Shane Freeder <theboyetronic@gmail.com>
33
Date: Mon, 2 Dec 2019 11:35:17 +0000
44
Subject: [PATCH] ConnectionInitEvent
@@ -67,7 +67,7 @@ index 00000000..6e79675f
6767
+ }
6868
+}
6969
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
70-
index f00a1a6c..15f853a5 100644
70+
index 77a458cc..b8b4b23c 100644
7171
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
7272
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
7373
@@ -1,6 +1,7 @@
@@ -78,7 +78,7 @@ index f00a1a6c..15f853a5 100644
7878
import io.netty.buffer.PooledByteBufAllocator;
7979
import io.netty.channel.Channel;
8080
import io.netty.channel.ChannelException;
81-
@@ -74,8 +75,23 @@ public class PipelineUtils
81+
@@ -75,8 +76,23 @@ public class PipelineUtils
8282
{
8383
return false;
8484
}
@@ -103,7 +103,7 @@ index f00a1a6c..15f853a5 100644
103103
ch.pipeline().addBefore( FRAME_DECODER, LEGACY_DECODER, new LegacyDecoder() );
104104
ch.pipeline().addAfter( FRAME_DECODER, PACKET_DECODER, new MinecraftDecoder( Protocol.HANDSHAKE, true, ProxyServer.getInstance().getProtocolVersion() ) );
105105
ch.pipeline().addAfter( FRAME_PREPENDER_AND_COMPRESS, PACKET_ENCODER, new MinecraftEncoder( Protocol.HANDSHAKE, true, ProxyServer.getInstance().getProtocolVersion() ) );
106-
@@ -94,6 +110,10 @@ public class PipelineUtils
106+
@@ -95,6 +111,10 @@ public class PipelineUtils
107107
{
108108
ch.pipeline().addFirst( new HAProxyMessageDecoder() );
109109
}
@@ -115,5 +115,5 @@ index f00a1a6c..15f853a5 100644
115115
return true;
116116
} ) );
117117
--
118-
2.47.1.windows.2
118+
2.43.0
119119

0 commit comments

Comments
 (0)