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:
e642b9dd Minecraft 24w13a support
db623d10 #3640: Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.1 to 3.2.2
61bb9f5b #3637: Bump org.projectlombok:lombok from 1.18.30 to 1.18.32
9551b453 #3639: Bump io.netty:netty-bom from 4.1.107.Final to 4.1.108.Final
dc680b87 #3636: Bump org.apache.maven.plugins:maven-gpg-plugin from 3.1.0 to 3.2.1
156eda78 #3635: Bump org.apache.maven.plugins:maven-compiler-plugin
31be68af Minecraft 24w12a support
ffa011c7 #3622: Revert "#3256: Allow - and . in online mode as some accounts still have these…"
22536c11 #3618: Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.2
2394e204 #3629: Fix scoreboard team data reading
1b88a847 Minecraft 24w10a support
This commit is contained in:
Shane Freeder 2024-03-29 18:03:46 +00:00
parent 66e27fa517
commit c7448e5017
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
9 changed files with 70 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 7606d4437b3cb13a42c834fd42dc8066a9380e5e
Subproject commit e642b9dde1ebb42003b1a56c98a47138d87cbe06

10
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From bdfcc6b096129a10275b6f836665d66651e17523 Mon Sep 17 00:00:00 2001
From be89fec835ee9a14d22f1bb7ae33a36e887258fa Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes
@ -67,7 +67,7 @@ index 4f520c31..a4ccb90c 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index bfb99f05..348ac8ef 100644
index 4dbf5e29..15546f07 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -514,7 +514,7 @@ index 56d505ab..f7bae2fe 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index edadae52..18b596f2 100644
index 5d52cc90..87ab1b76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
@ -612,7 +612,7 @@ index edadae52..18b596f2 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
</plugin>
<plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
@ -848,5 +848,5 @@ index 3b944b85..1b61e3ad 100644
<properties>
--
2.43.0.windows.1
2.44.0

10
BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From ed5c5e8d2a9aea5d027fef9f1b591271a9b38ee8 Mon Sep 17 00:00:00 2001
From 702afc4df45926f3d96841ffb908f3b85cb2d3f0 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -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 88ffac74..c83b91af 100644
index cb5c30d5..a8a91955 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
@@ -851,14 +851,23 @@ public enum Protocol
@@ -861,14 +861,23 @@ public enum Protocol
return protocol;
}
@ -66,7 +66,7 @@ index 88ffac74..c83b91af 100644
throw new BadPacketException( "Packet with id " + id + " outside of range" );
}
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 3bc72011..780f46c4 100644
index 37f86325..1b7395ad 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -234,6 +234,12 @@ public class ServerConnector extends PacketHandler
@ -100,5 +100,5 @@ index 2bf92a03..ccebe19f 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.43.0.windows.1
2.44.0

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

@ -1,4 +1,4 @@
From 0aae040201bde6587860e6cc882beb6fd2fe80f0 Mon Sep 17 00:00:00 2001
From 5343292903efcc962a2a510267018bb5872c3995 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 219e94b4..4162639f 100644
index f80515d4..050cc29b 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
@@ -50,6 +50,8 @@ public class UpstreamBridge extends PacketHandler
@@ -51,6 +51,8 @@ public class UpstreamBridge extends PacketHandler
private final ProxyServer bungee;
private final UserConnection con;
@ -85,7 +85,7 @@ index 219e94b4..4162639f 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -223,6 +225,20 @@ public class UpstreamBridge extends PacketHandler
@@ -230,6 +232,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{
@ -107,5 +107,5 @@ index 219e94b4..4162639f 100644
boolean isRegisteredCommand = false;
boolean isCommand = tabComplete.getCursor().startsWith( "/" );
--
2.43.0.windows.1
2.44.0

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

@ -1,4 +1,4 @@
From d3b6ff41a2efadd91fe9eb5ceb770f5ba9207cbb Mon Sep 17 00:00:00 2001
From f3c9d4d4def15946b7de244db86dd3d41e6b8c00 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
@ -7,7 +7,7 @@ This functionality of this patch was adopted upstream, however, this
patch remains for a few misc improvements around here
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 780f46c4..e38f52d5 100644
index 1b7395ad..e670a57a 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -522,6 +522,6 @@ public class ServerConnector extends PacketHandler
@ -19,7 +19,7 @@ index 780f46c4..e38f52d5 100644
}
}
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 61ce9ed6..976c8e26 100644
index d408840d..cd3ed518 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -790,6 +790,6 @@ public class DownstreamBridge extends PacketHandler
@ -57,10 +57,10 @@ index 43fb3208..4325fe23 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 4162639f..c08bf24b 100644
index 050cc29b..740c90ec 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
@@ -389,6 +389,6 @@ public class UpstreamBridge extends PacketHandler
@@ -396,6 +396,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -69,5 +69,5 @@ index 4162639f..c08bf24b 100644
}
}
--
2.43.0.windows.1
2.44.0

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

@ -1,14 +1,14 @@
From 07f87b89d0d17f8ffc963b5f574fb3de5d99161b Mon Sep 17 00:00:00 2001
From c2b289e6620daa7c46cad38a419a0e27dce03fbd 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 c08bf24b..4322dbad 100644
index 740c90ec..3084e7e7 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
@@ -200,6 +200,7 @@ public class UpstreamBridge extends PacketHandler
@@ -207,6 +207,7 @@ public class UpstreamBridge extends PacketHandler
private String handleChat(String message)
{
@ -16,7 +16,7 @@ index c08bf24b..4322dbad 100644
for ( int index = 0, length = message.length(); index < length; index++ )
{
char c = message.charAt( index );
@@ -207,8 +208,14 @@ public class UpstreamBridge extends PacketHandler
@@ -214,8 +215,14 @@ public class UpstreamBridge extends PacketHandler
{
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
throw CancelSendSignal.INSTANCE;
@ -32,5 +32,5 @@ index c08bf24b..4322dbad 100644
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
--
2.43.0.windows.1
2.44.0

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

@ -1,14 +1,14 @@
From f393428127f636000f82443d9f7c4bbd5016c196 Mon Sep 17 00:00:00 2001
From 26a6b2a630825182a7712505f7212c1bf397d446 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
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 4b52c8b1..3a199578 100644
index 7f0b6105..14ad2e71 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
@@ -263,4 +263,14 @@ public abstract class AbstractPacketHandler
@@ -268,4 +268,14 @@ public abstract class AbstractPacketHandler
public void handle(CookieResponse cookieResponse) throws Exception
{
}
@ -142,7 +142,7 @@ index 7e36c0eb..86223e17 100644
@Setter
private String lastCommandTabbed;
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 7e416a6d..8a10b057 100644
index d4036c5d..ad9fc042 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -753,6 +753,32 @@ public class DownstreamBridge extends PacketHandler
@ -216,5 +216,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.43.0.windows.1
2.44.0

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

@ -1,4 +1,4 @@
From 3251af3cd2f65b41d5142959d55cde21ce2769d4 Mon Sep 17 00:00:00 2001
From a19eb650fe93a822c0387553200ca16fa1c6643d 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 c83b91af..37142e26 100644
index a8a91955..414d4578 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 c83b91af..37142e26 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -932,9 +934,12 @@ public enum Protocol
@@ -942,9 +944,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}
@ -34,5 +34,5 @@ index c83b91af..37142e26 100644
}
}
--
2.43.0.windows.1
2.44.0

55
BungeeCord-Patches/0066-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch
View File

@ -1,14 +1,14 @@
From 29e84de113d54895e028971010ba2d8b8467c269 Mon Sep 17 00:00:00 2001
From 89d615e5423ffd5ff38790c6cbea9eb93e53b307 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
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 3a199578..52225870 100644
index 14ad2e71..fe6c7339 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
@@ -272,5 +272,9 @@ public abstract class AbstractPacketHandler
@@ -277,5 +277,9 @@ public abstract class AbstractPacketHandler
public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
{
}
@ -19,12 +19,12 @@ index 3a199578..52225870 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 37142e26..aba0f85e 100644
index 414d4578..3a69fced 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
@@ -538,6 +538,13 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_19, 0x04 ),
map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 )
@@ -545,6 +545,13 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 ),
map( ProtocolConstants.MINECRAFT_1_20_5, 0x06 )
);
+ // Waterfall start
+ TO_SERVER.registerPacket(
@ -76,10 +76,10 @@ index 00000000..08ecf2a3
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
index 887ff29f..d4700090 100644
index fb53ba74..f8e2db8d 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
@@ -108,4 +108,9 @@ public class ClientCommand extends DefinedPacket
@@ -118,4 +118,9 @@ public class ClientCommand extends DefinedPacket
{
handler.handle( this );
}
@ -90,40 +90,53 @@ index 887ff29f..d4700090 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 4322dbad..c0a04846 100644
index 3084e7e7..333db20f 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
@@ -195,10 +195,15 @@ public class UpstreamBridge extends PacketHandler
@@ -196,16 +196,22 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(ClientCommand command) throws Exception
{
- handleChat( "/" + command.getCommand() );
+ handleChat( "/" + command.getCommand(), command ); // Waterfall
+ handleChat( "/" + command.getCommand(), command, null ); // Waterfall
}
- private String handleChat(String message)
+ // Waterfall start
+ private String handleChat(String message) {
+ return handleChat(message, null);
@Override
public void handle(ClientCommandSigned command) throws Exception
{
- handleChat( "/" + command.getCommand() );
+ handleChat( "/" + command.getCommand(), null, command ); // Waterfall
}
private String handleChat(String message)
+ {
+ // Waterfall start
+ return handleChat(message, null, null);
+ }
+ private String handleChat(String message, @javax.annotation.Nullable ClientCommand clientCommand)
+ private String handleChat(String message, @javax.annotation.Nullable ClientCommand clientCommand, @javax.annotation.Nullable ClientCommandSigned clientCommandSigned)
+ // Waterfall end
{
boolean empty = true;
for ( int index = 0, length = message.length(); index < length; index++ )
@@ -224,6 +229,12 @@ public class UpstreamBridge extends PacketHandler
@@ -231,7 +237,18 @@ public class UpstreamBridge extends PacketHandler
if ( !chatEvent.isCommand() || !bungee.getPluginManager().dispatchCommand( con, message.substring( 1 ) ) )
{
return message;
+ // Waterfall start - We're going to cancel this packet, so, no matter what, we might as well try to send this
+ } else if(clientCommand != null && clientCommand.isSigned() && clientCommand.getSeenMessages() != null) {
+ } else if (clientCommand != null && clientCommand.isSigned() && clientCommand.getSeenMessages() != null) {
+ if (con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_19_3) {
+ con.getServer().unsafe().sendPacket(new net.md_5.bungee.protocol.packet.ClientChatAcknowledgement(clientCommand.getSeenMessages().getOffset()));
+ }
+ // Waterfall end
+ // and then for the new one
+ } else if (clientCommandSigned != null) {
+ if (con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_20_5) {
+ con.getServer().unsafe().sendPacket(new net.md_5.bungee.protocol.packet.ClientChatAcknowledgement(clientCommandSigned.getSeenMessages().getOffset()));
+ }
}
+ // Waterfall end
}
throw CancelSendSignal.INSTANCE;
}
--
2.43.0.windows.1
2.44.0