Skip to content

Commit

Permalink
Updated Upstream (BungeeCord)
Browse files Browse the repository at this point in the history
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:
52ab21b1 #3682: Bump io.netty:netty-bom from 4.1.109.Final to 4.1.110.Final
8e8a6353 Minecraft 24w21b support
18eae8a1 #3664: Improve chat test code quality
  • Loading branch information
electronicboy committed May 27, 2024
1 parent 1231b4d commit 6db0f23
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 41 deletions.
8 changes: 4 additions & 4 deletions BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From a711f758f121225516b930a37d60a995354ace22 Mon Sep 17 00:00:00 2001
From d5c02b4a1a18cfdfe29e3149b11f5e9855d52e29 Mon Sep 17 00:00:00 2001
From: Troy Frew <[email protected]>
Date: Tue, 15 Nov 2016 09:07:51 -0500
Subject: [PATCH] Fixup ProtocolConstants


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 40045b77..c6ad1f54 100644
index 2b1487e0..79b298e3 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
@@ -118,6 +118,16 @@ public class ProtocolConstants
@@ -119,6 +119,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}

Expand All @@ -26,5 +26,5 @@ index 40045b77..c6ad1f54 100644
{

--
2.44.0
2.45.1

17 changes: 8 additions & 9 deletions BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 455892a5aa7454f2c3e2fe8b8f6e6d0c6ad71c5d Mon Sep 17 00:00:00 2001
From 8f8e0123c0deaad1471e4681e747ad93045b9798 Mon Sep 17 00:00:00 2001
From: Tux <[email protected]>
Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API


diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
index 7e14484b..3698762c 100644
index 2d8233e6..276322a8 100644
--- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
@@ -696,6 +696,26 @@ public class ComponentsTest
@@ -673,6 +673,26 @@ public class ComponentsTest
assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
}

Expand Down Expand Up @@ -36,14 +36,13 @@ index 7e14484b..3698762c 100644
public void testLoopSimple()
{
diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
index 47c06baa..2552a34f 100644
index 995c70f2..dd9f040d 100644
--- a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
@@ -25,4 +25,12 @@ public class TranslatableComponentTest
assertEquals( "Test string with a placeholder", BaseComponent.toPlainText( baseComponents ) );
assertEquals( "§fTest string with §fa§f placeholder", BaseComponent.toLegacyText( baseComponents ) );
@@ -48,4 +48,11 @@ public class TranslatableComponentTest
assertEquals( "Buried Treasure Map", one_four_two.toPlainText() );
}
+
+ @Test
+ public void testEscapedPercentInPlainText()
+ {
Expand All @@ -53,5 +52,5 @@ index 47c06baa..2552a34f 100644
+ }
}
--
2.44.0
2.45.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ea36c5dc9f008d20bbef476f4af4f0ce9301aed0 Mon Sep 17 00:00:00 2001
From 729077c39ea8d44f92ec3941204a153369368729 Mon Sep 17 00:00:00 2001
From: Techcable <[email protected]>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
Expand Down Expand Up @@ -37,10 +37,10 @@ index d79d5e5c..250e7620 100644
{
packet.read( in, protocol, prot.getDirection(), protocolVersion );
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 2271a2e5..d932b696 100644
index 317fb2d4..db50f379 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
@@ -862,14 +862,23 @@ public enum Protocol
@@ -884,14 +884,23 @@ public enum Protocol
return protocol;
}

Expand Down Expand Up @@ -83,10 +83,10 @@ index 7a211f1b..a25a493e 100644

ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index 2bf92a03..ccebe19f 100644
index 70b58fab..0045a449 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -342,6 +342,12 @@ public abstract class EntityMap
@@ -343,6 +343,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;

Expand All @@ -100,5 +100,5 @@ index 2bf92a03..ccebe19f 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.44.0
2.45.1

Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From bf5145136df8e794c207bb4c8c49c02dbf26eb6d Mon Sep 17 00:00:00 2001
From f5c341bf2e3a268299c88c9fe9726111194e498d Mon Sep 17 00:00:00 2001
From: Aaron Hill <[email protected]>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9


diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
index 7f0b6105..14ad2e71 100644
index 8d91211b..e2221010 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
@@ -268,4 +268,14 @@ public abstract class AbstractPacketHandler
public void handle(CookieResponse cookieResponse) throws Exception
@@ -278,4 +278,14 @@ public abstract class AbstractPacketHandler
public void handle(ServerLinks serverLinks) throws Exception
{
}
+
+
+ // Waterfall start
+ public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception
+ {
Expand Down Expand Up @@ -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 7e36c0eb..86223e17 100644
index d8f7bc95..d15f2bcc 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 @@
Expand Down Expand Up @@ -216,5 +216,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.44.0
2.45.1

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3eb3ba0ef9ff74b095ea44a1385af0b3a5a71293 Mon Sep 17 00:00:00 2001
From 19006aa082232d2d527b49872c4e8c14988a8565 Mon Sep 17 00:00:00 2001
From: Shane Freeder <[email protected]>
Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting
Expand Down Expand Up @@ -157,7 +157,7 @@ index ad9fc042..6ed25f82 100644
}

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index ccebe19f..cb4f1098 100644
index 0045a449..39eab669 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -27,6 +27,11 @@ public abstract class EntityMap
Expand All @@ -172,7 +172,7 @@ index ccebe19f..cb4f1098 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -304,7 +309,13 @@ public abstract class EntityMap
@@ -305,7 +310,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
Expand Down Expand Up @@ -225,5 +225,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.44.0
2.45.1

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
From f9ca58d3ac570d6f371413fbb3536c881480418e Mon Sep 17 00:00:00 2001
From c4dec751225b67840a2d1092920fd487d2b4d165 Mon Sep 17 00:00:00 2001
From: Shane Freeder <[email protected]>
Date: Sun, 12 Jun 2022 06:45:54 +0100
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 d932b696..7a29eb0d 100644
index db50f379..b0473509 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;
Expand All @@ -18,7 +18,7 @@ index d932b696..7a29eb0d 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -943,9 +945,12 @@ public enum Protocol
@@ -965,9 +967,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}
Expand All @@ -34,5 +34,5 @@ index d932b696..7a29eb0d 100644
}
}
--
2.44.0
2.45.1

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From a1cd3244c064607b5bc98a9ea9fb5b6ed244c852 Mon Sep 17 00:00:00 2001
From 0952d57b25738151a17baef23d393ed7f4356861 Mon Sep 17 00:00:00 2001
From: Shane Freeder <[email protected]>
Date: Sun, 15 Oct 2023 00:36:38 +0100
Subject: [PATCH] Prevent proxy commands from breaking the chat chain system


diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
index 33b246bc..7f5935c3 100644
index e2221010..4dde7257 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
@@ -277,5 +277,9 @@ public abstract class AbstractPacketHandler
@@ -287,5 +287,9 @@ public abstract class AbstractPacketHandler
public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
{
}
Expand All @@ -19,10 +19,10 @@ index 33b246bc..7f5935c3 100644
// Waterfall end
}
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 7a29eb0d..67e0f085 100644
index b0473509..f25d3fab 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
@@ -546,6 +546,13 @@ public enum Protocol
@@ -558,6 +558,13 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 ),
map( ProtocolConstants.MINECRAFT_1_20_5, 0x06 )
);
Expand Down Expand Up @@ -133,5 +133,5 @@ index 2dafa4d9..b482fe2e 100644
throw CancelSendSignal.INSTANCE;
}
--
2.44.0
2.45.1

0 comments on commit 6db0f23

Please sign in to comment.