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:
5467e3a8 Minecraft 1.19.3 support
This commit is contained in:
Shane Freeder 2022-12-07 16:30:18 +00:00
parent d6688e05e6
commit 8050674c86
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
18 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 511017ab35e621f4173e7425c0735aa3c19b3964
Subproject commit 5467e3a8424fdc4b72a26fc35d9a0432333fa4b2

8
BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
View File

@ -1,14 +1,14 @@
From 7568c27acbd910ea05e9408a796e54ad3c9b6ddd Mon Sep 17 00:00:00 2001
From 59c0c10b00810eac449595aa6f96e35cc1a647c4 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
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 0471b9a5..aa5daf47 100644
index 17d741d8..85f1b0b4 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
@@ -105,6 +105,16 @@ public class ProtocolConstants
@@ -107,6 +107,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}
@ -26,5 +26,5 @@ index 0471b9a5..aa5daf47 100644
{
--
2.37.1
2.38.1

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

@ -1,4 +1,4 @@
From c0d98ec188ecc7b38d6b29d67621234eb00a0c24 Mon Sep 17 00:00:00 2001
From 9eec1e3623ac972c5502b27534f7d648b78bad75 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -63,10 +63,10 @@ index 3be014b2..e00c5659 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 6f5ef07b..e41bfcfd 100644
index 25fdc742..1059c67f 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
@@ -277,7 +277,7 @@ public class DownstreamBridge extends PacketHandler
@@ -293,7 +293,7 @@ public class DownstreamBridge extends PacketHandler
brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@ -89,5 +89,5 @@ index 56563346..61165e43 100644
{
@Override
--
2.37.1
2.38.1

8
BungeeCord-Patches/0015-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From 4a506692e5bb55cbf8e871f4612fb9a53dad822e Mon Sep 17 00:00:00 2001
From feede4c38be31f029da9c86306795c9b94ae1e69 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations
@ -8,10 +8,10 @@ Subject: [PATCH] Micro-optimizations
- Don't create a data input stream for every plugin message we get from servers
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 e41bfcfd..9c724115 100644
index 1059c67f..889e60c2 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
@@ -259,7 +259,6 @@ public class DownstreamBridge extends PacketHandler
@@ -275,7 +275,6 @@ public class DownstreamBridge extends PacketHandler
@SuppressWarnings("checkstyle:avoidnestedblocks")
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -19,7 +19,7 @@ index e41bfcfd..9c724115 100644
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -286,6 +285,7 @@ public class DownstreamBridge extends PacketHandler
@@ -302,6 +301,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{

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

@ -1,4 +1,4 @@
From b3057a714b38ebe1b996866c97b3f45df47a5081 Mon Sep 17 00:00:00 2001
From f8da61f6c957f1e32382087d12dad4b7ed26c6d4 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 773e954c..57bd22b7 100644
{
packet.read( in, 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 aa22f134..7a1fdac5 100644
index f746c4ff..52bc1ae7 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
@@ -589,14 +589,23 @@ public enum Protocol
@@ -627,14 +627,23 @@ public enum Protocol
return protocol;
}
@ -105,10 +105,10 @@ index d642e68d..bac51311 100644
@Getter
@NonNull
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 dc949c66..fcf6788a 100644
index 68c6ca2d..61ad307a 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
@@ -332,6 +332,12 @@ public abstract class EntityMap
@@ -333,6 +333,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index dc949c66..fcf6788a 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.37.1
2.38.1

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

@ -1,4 +1,4 @@
From 57168eee47c7b9ad899fdb85640c9022dbbead09 Mon Sep 17 00:00:00 2001
From 3d566b44103875552570fe60c2810ee911736707 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 bb3faf5d..e6d5da03 100644
index 37a17c21..e87cd53a 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
@@ -42,6 +42,8 @@ public class UpstreamBridge extends PacketHandler
@@ -44,6 +44,8 @@ public class UpstreamBridge extends PacketHandler
private final ProxyServer bungee;
private final UserConnection con;
@ -85,7 +85,7 @@ index bb3faf5d..e6d5da03 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -196,6 +198,20 @@ public class UpstreamBridge extends PacketHandler
@@ -211,6 +213,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{
@ -107,5 +107,5 @@ index bb3faf5d..e6d5da03 100644
boolean isRegisteredCommand = false;
--
2.35.3
2.38.1

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

@ -1,4 +1,4 @@
From 807ec5dcb9380f01a593df69e5576117f306ce37 Mon Sep 17 00:00:00 2001
From 143303bff7299c8d2eca69429593c9c1373edd78 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
@ -19,10 +19,10 @@ index aa721cdc..981b0200 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 9c724115..a0301a95 100644
index 889e60c2..2e436999 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
@@ -691,6 +691,6 @@ public class DownstreamBridge extends PacketHandler
@@ -707,6 +707,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -31,7 +31,7 @@ index 9c724115..a0301a95 100644
}
}
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 0e08e71d..c2f26bc7 100644
index 59e74208..115e95a4 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -719,20 +719,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -57,10 +57,10 @@ index 0e08e71d..c2f26bc7 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 147e5b20..d560cef6 100644
index e87cd53a..c30093d7 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
@@ -313,6 +313,6 @@ public class UpstreamBridge extends PacketHandler
@@ -328,6 +328,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{

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

@ -1,14 +1,14 @@
From ef16549d09c6a26772a904c40709b6a5edfd020c Mon Sep 17 00:00:00 2001
From 1ad7c256df61501135b1778df071ad335a9cd86c 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 58736e6f..b9a4b03c 100644
index c30093d7..d72208e7 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
@@ -173,6 +173,7 @@ public class UpstreamBridge extends PacketHandler
@@ -188,6 +188,7 @@ public class UpstreamBridge extends PacketHandler
private String handleChat(String message)
{
@ -16,7 +16,7 @@ index 58736e6f..b9a4b03c 100644
for ( int index = 0, length = message.length(); index < length; index++ )
{
char c = message.charAt( index );
@@ -180,8 +181,11 @@ public class UpstreamBridge extends PacketHandler
@@ -195,8 +196,11 @@ public class UpstreamBridge extends PacketHandler
{
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
throw CancelSendSignal.INSTANCE;
@ -29,5 +29,5 @@ index 58736e6f..b9a4b03c 100644
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
--
2.35.3
2.38.1

12
BungeeCord-Patches/0026-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From 0027c75f59e7413a26d0f95060b084961893a514 Mon Sep 17 00:00:00 2001
From 4ac61dbb433da47f6a5992822fe15e03d9e72a58 Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent
@ -75,10 +75,10 @@ index 981b0200..9bd063f5 100644
{
// Pre cancel the event if we are going to try another server
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 a0301a95..de932814 100644
index 2e436999..c5217561 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
@@ -88,16 +88,19 @@ public class DownstreamBridge extends PacketHandler
@@ -90,16 +90,19 @@ public class DownstreamBridge extends PacketHandler
return;
}
@ -103,7 +103,7 @@ index a0301a95..de932814 100644
}
@Override
@@ -112,7 +115,19 @@ public class DownstreamBridge extends PacketHandler
@@ -114,7 +117,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() )
{
@ -124,7 +124,7 @@ index a0301a95..de932814 100644
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -566,7 +581,11 @@ public class DownstreamBridge extends PacketHandler
@@ -582,7 +597,11 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@ -138,5 +138,5 @@ index a0301a95..de932814 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.37.1
2.38.1

16
BungeeCord-Patches/0031-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,11 +1,11 @@
From 6ce9629fc1456ddcb536bb6406b2a7d4d2aace73 Mon Sep 17 00:00:00 2001
From a39c0b052c59de504031af65d96d6d0158f6405f 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 608769eb..1defe650 100644
index 88865b85..0c334afc 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
@@ -10,6 +10,8 @@ import net.md_5.bungee.protocol.packet.ClientStatus;
@ -17,7 +17,7 @@ index 608769eb..1defe650 100644
import net.md_5.bungee.protocol.packet.EntityStatus;
import net.md_5.bungee.protocol.packet.GameState;
import net.md_5.bungee.protocol.packet.Handshake;
@@ -213,4 +215,14 @@ public abstract class AbstractPacketHandler
@@ -223,4 +225,14 @@ public abstract class AbstractPacketHandler
public void handle(ServerData serverData) throws Exception
{
}
@ -33,7 +33,7 @@ index 608769eb..1defe650 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 7a1fdac5..9701705d 100644
index 52bc1ae7..e15926d3 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
@@ -20,6 +20,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@ -45,7 +45,7 @@ index 7a1fdac5..9701705d 100644
import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
@@ -131,6 +133,20 @@ public enum Protocol
@@ -136,6 +138,20 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_17, 0x0D ),
map( ProtocolConstants.MINECRAFT_1_19, 0x0A )
);
@ -185,7 +185,7 @@ index 846f8338..7fe08ecd 100644
@Getter
private String displayName;
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 de932814..e3171326 100644
index c5217561..85628a7a 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
@@ -51,6 +51,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
@ -197,7 +197,7 @@ index de932814..e3171326 100644
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
import net.md_5.bungee.protocol.packet.PlayerListItem;
@@ -666,6 +668,32 @@ public class DownstreamBridge extends PacketHandler
@@ -682,6 +684,32 @@ public class DownstreamBridge extends PacketHandler
}
}
@ -268,5 +268,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.37.1
2.38.1

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

@ -1,4 +1,4 @@
From e129a2d1042dfe9b973df216ea418b41331b80dd Mon Sep 17 00:00:00 2001
From 8be8d4cde11d6f17fc38ab464cdd01fc247080fa 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
@ -140,10 +140,10 @@ index 7fe08ecd..5961392a 100644
+ // Waterfall end
}
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 e3171326..3b56018a 100644
index 85628a7a..5105df8b 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
@@ -672,6 +672,7 @@ public class DownstreamBridge extends PacketHandler
@@ -688,6 +688,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityEffect entityEffect) throws Exception
{
@ -151,7 +151,7 @@ index e3171326..3b56018a 100644
// Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
// condition on the client.
if (this.con.getForgeClientHandler().isForgeUser() && !this.con.getForgeClientHandler().isHandshakeComplete()) {
@@ -683,6 +684,7 @@ public class DownstreamBridge extends PacketHandler
@@ -699,6 +700,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityRemoveEffect removeEffect) throws Exception
{
@ -160,7 +160,7 @@ index e3171326..3b56018a 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 fcf6788a..1b639a23 100644
index 61ad307a..ad951df0 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
@ -175,7 +175,7 @@ index fcf6788a..1b639a23 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -294,7 +299,13 @@ public abstract class EntityMap
@@ -295,7 +300,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -228,5 +228,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.37.1
2.38.1

8
BungeeCord-Patches/0046-Add-ProxyDefineCommandsEvent.patch
View File

@ -1,4 +1,4 @@
From 69adecb315d4a27121887e2c9dc29850d989e77d Mon Sep 17 00:00:00 2001
From 1723728a7c34cc7d08fa4c4c4f172e0656835716 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 14 Mar 2019 07:44:06 +0000
Subject: [PATCH] Add ProxyDefineCommandsEvent
@ -54,7 +54,7 @@ index 00000000..1fd4fc90
+
+}
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 3b56018a..a4f242b2 100644
index 5105df8b..490171c4 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
@@ -19,8 +19,10 @@ import io.netty.channel.unix.DomainSocketAddress;
@ -68,7 +68,7 @@ index 3b56018a..a4f242b2 100644
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.ServerConnection;
import net.md_5.bungee.ServerConnection.KeepAliveData;
@@ -707,9 +709,25 @@ public class DownstreamBridge extends PacketHandler
@@ -723,9 +725,25 @@ public class DownstreamBridge extends PacketHandler
{
boolean modified = false;
@ -97,5 +97,5 @@ index 3b56018a..a4f242b2 100644
CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
.then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
--
2.37.1
2.38.1

10
BungeeCord-Patches/0049-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From 874380a169f4fc28c668f7015af39e996ce77e1e Mon Sep 17 00:00:00 2001
From a01c62131014500d4a4bb25aa7afaaf738a3342b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 25 Nov 2019 19:54:06 +0000
Subject: [PATCH] Speed up some common exceptions
@ -67,10 +67,10 @@ index 6c0ef4df..f20104a2 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index 5fe55dcc..122e3b52 100644
index 111802f7..d3559188 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -19,6 +19,9 @@ import se.llbit.nbt.Tag;
@@ -22,6 +22,9 @@ import se.llbit.nbt.Tag;
public abstract class DefinedPacket
{
@ -80,7 +80,7 @@ index 5fe55dcc..122e3b52 100644
public static void writeString(String s, ByteBuf buf)
{
writeString( s, buf, Short.MAX_VALUE );
@@ -145,13 +148,18 @@ public abstract class DefinedPacket
@@ -148,13 +151,18 @@ public abstract class DefinedPacket
byte in;
while ( true )
{
@ -146,7 +146,7 @@ index b68b33a9..f5e414c1 100644
{
if ( slice != null )
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 ddc04fda..4346696f 100644
index 707232a5..600037f4 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -16,6 +16,8 @@ import java.util.Set;

8
BungeeCord-Patches/0052-Allow-to-disable-tablist-rewrite.patch
View File

@ -1,4 +1,4 @@
From 8539f47471127e98aae462b3e99162913ee41663 Mon Sep 17 00:00:00 2001
From 7d1a9e8645b530dc87f51d40cec9ba8ce3f6edac Mon Sep 17 00:00:00 2001
From: xDark <aleshkailyashevich@gmail.com>
Date: Fri, 31 May 2019 08:11:31 +0300
Subject: [PATCH] Allow to disable tablist rewrite
@ -50,10 +50,10 @@ index e860214f..b88e3c8a 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 a4f242b2..9dfb11e9 100644
index 490171c4..0c9cfb02 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
@@ -168,8 +168,14 @@ public class DownstreamBridge extends PacketHandler
@@ -170,8 +170,14 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(PlayerListItem playerList) throws Exception
{
@ -71,5 +71,5 @@ index a4f242b2..9dfb11e9 100644
@Override
--
2.37.2
2.38.1

8
BungeeCord-Patches/0053-Remove-version-from-brand-info.patch
View File

@ -1,14 +1,14 @@
From 9517e5243c1c1a99dac097ab47522deb1918109b Mon Sep 17 00:00:00 2001
From bb5732db8c6fa66d335f6d46b3c07f9444a613c7 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 20 Jun 2020 18:21:17 +0100
Subject: [PATCH] Remove version from brand info
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 9dfb11e9..59d204ce 100644
index 0c9cfb02..89b98b36 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
@@ -300,7 +300,7 @@ public class DownstreamBridge extends PacketHandler
@@ -316,7 +316,7 @@ public class DownstreamBridge extends PacketHandler
Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" );
brand = ByteBufAllocator.DEFAULT.heapBuffer();
@ -18,5 +18,5 @@ index 9dfb11e9..59d204ce 100644
brand.release();
// changes in the packet are ignored so we need to send it manually
--
2.37.2
2.38.1

16
BungeeCord-Patches/0056-Additional-DoS-mitigations.patch
View File

@ -1,4 +1,4 @@
From 6a4bb0c0def82d865517d5d08810a3f68a60acf1 Mon Sep 17 00:00:00 2001
From 811cfe0f1dfcae2fff7c333beb3a28ddbbf4d221 Mon Sep 17 00:00:00 2001
From: "Five (Xer)" <admin@fivepb.me>
Date: Sat, 30 Jan 2021 18:04:14 +0100
Subject: [PATCH] Additional DoS mitigations
@ -8,10 +8,10 @@ Courtesy of Tux and the Velocity Contributors. See:
https://github.com/VelocityPowered/Velocity/commit/5ceac16a821ea35572ff11412ace8929fd06e278
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index 122e3b52..561a9522 100644
index d3559188..59f2cb73 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -54,6 +54,7 @@ public abstract class DefinedPacket
@@ -57,6 +57,7 @@ public abstract class DefinedPacket
int len = readVarInt( buf );
if ( len > maxLen * 3 )
{
@ -19,7 +19,7 @@ index 122e3b52..561a9522 100644
throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
}
@@ -62,6 +63,7 @@ public abstract class DefinedPacket
@@ -65,6 +66,7 @@ public abstract class DefinedPacket
if ( s.length() > maxLen )
{
@ -27,7 +27,7 @@ index 122e3b52..561a9522 100644
throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
}
@@ -346,4 +348,21 @@ public abstract class DefinedPacket
@@ -396,4 +398,21 @@ public abstract class DefinedPacket
@Override
public abstract String toString();
@ -145,7 +145,7 @@ index f5e414c1..ac83e325 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
index 8a60be9f..50bb52b1 100644
index 63e9d18d..545eec72 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
@@ -63,4 +63,17 @@ public class EncryptionResponse extends DefinedPacket
@ -167,7 +167,7 @@ index 8a60be9f..50bb52b1 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
index d9839973..682c8784 100644
index 5186a6a8..3224b0d2 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
@@ -65,4 +65,13 @@ public class LoginRequest extends DefinedPacket
@ -235,5 +235,5 @@ index 738f0c92..ec33d337 100644
+ // Waterfall end
}
--
2.37.2
2.38.1

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

@ -1,4 +1,4 @@
From f3af05e83cb5b18878d1a15ef93e843e8cd952eb Mon Sep 17 00:00:00 2001
From 467efc579e812d1c490ccd3ec45254f899303c0f 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 9701705d..b852a24e 100644
index e15926d3..2357f380 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 9701705d..b852a24e 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -675,9 +677,12 @@ public enum Protocol
@@ -713,9 +715,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}
@ -34,5 +34,5 @@ index 9701705d..b852a24e 100644
}
}
--
2.37.2
2.38.1

6
BungeeCord-Patches/0065-Add-message-for-outdated-clients-that-don-t-support-.patch
View File

@ -1,4 +1,4 @@
From 0e1d3e227cfd6fead7f0c0377fb2807efb98b515 Mon Sep 17 00:00:00 2001
From 577049261537afb57f99737f5e2770dc83052713 Mon Sep 17 00:00:00 2001
From: Aurora <aurora@relanet.eu>
Date: Mon, 18 Jul 2022 15:56:05 +0200
Subject: [PATCH] Add message for outdated clients that don't support secure
@ -8,12 +8,12 @@ Clients before 1.19 don't support secure profiles, but since secure profiles is
things checked those outdated clients didn't get a useful message telling them to update.
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 e8ceddf7..c1fbf84c 100644
index 789214de..a19bbdd0 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -396,6 +396,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() )
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 )
{
+ if ( handshake.getProtocolVersion() < ProtocolConstants.MINECRAFT_1_19 ) {disconnect(bungee.getTranslation("secure_profile_unsupported"));} // Waterfall - Tell old clients to update if secure profiles are required
PlayerPublicKey publicKey = loginRequest.getPublicKey();