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: eae9d45c Provide more information in connect errors d2d157c1 #3246: Fix commands not working due to MinecraftForge changes
2025-01-05 23:48:06 +01:00 · 2022-02-06 05:54:54 +00:00 · 2022-02-06 05:54:54 +00:00 · 65ec15e5cc
commit 65ec15e5cc
parent acff2e0148
14 changed files with 71 additions and 89 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9c95d4ba43ba84d10e8bb7d7c92d7e6c5f161ed2
+Subproject commit eae9d45c8a4142541dfda7f6322784d148d4b027
--- a/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
+++ b/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
@ -1,4 +1,4 @@
-From d465f043c5f09769e7e2cacb6f450ec496eeb62e Mon Sep 17 00:00:00 2001
+From d92a53555ebe6363d56184c39d60d263f519b3ed 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
@ -56,10 +56,10 @@ index 7c082d46..5c74d5f1 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 075676e7..abad8e3d 100644
+index 257779bf..c0cd8570 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
-@@ -269,7 +269,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -276,7 +276,7 @@ public class DownstreamBridge extends PacketHandler
 
             brand = ByteBufAllocator.DEFAULT.heapBuffer();
             DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@ -86,5 +86,5 @@ index 1533eadc..a715ec8a 100644
     {
         @Override
 -- 
-2.33.0
+2.35.1

--- a/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
+++ b/BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
@ -1,4 +1,4 @@
-From 79c917d08b19290dd8d9f4a52bec05d95d8b3ecc Mon Sep 17 00:00:00 2001
+From 79e294bbcc469302c659cb0fd5545854d5c4d1e7 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 5c74d5f1..d1715b9c 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 bf25658b..9a18e4cc 100644
+index e481d6df..04a3a73c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -164,8 +164,12 @@ public final class UserConnection implements ProxiedPlayer
+@@ -163,8 +163,12 @@ public final class UserConnection implements ProxiedPlayer
 
         forgeClientHandler = new ForgeClientHandler( this );
 
@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
      * The FML 1.8 handshake token.
      */
 -- 
-2.34.0
+2.35.1

--- a/BungeeCord-Patches/0015-Micro-optimizations.patch
+++ b/BungeeCord-Patches/0015-Micro-optimizations.patch
@ -1,4 +1,4 @@
-From d30c8c138f1e6d73fbe4bc586b1bd523a45a7ae7 Mon Sep 17 00:00:00 2001
+From d2e4ef8cea2353c302776ba3bf29f4a2fcf32569 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
@ -23,10 +23,10 @@ index dddc14d8..7227f268 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 abad8e3d..d9facc62 100644
+index c0cd8570..a047c8b7 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
-@@ -251,7 +251,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -258,7 +258,6 @@ public class DownstreamBridge extends PacketHandler
     @SuppressWarnings("checkstyle:avoidnestedblocks")
     public void handle(PluginMessage pluginMessage) throws Exception
     {
@ -34,7 +34,7 @@ index abad8e3d..d9facc62 100644
         PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
 
         if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -278,6 +277,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -285,6 +284,7 @@ public class DownstreamBridge extends PacketHandler
 
         if ( pluginMessage.getTag().equals( "BungeeCord" ) )
         {
@ -43,5 +43,5 @@ index abad8e3d..d9facc62 100644
             String subChannel = in.readUTF();
 
 -- 
-2.30.1 (Apple Git-130)
+2.35.1

--- a/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
+++ b/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
@ -1,4 +1,4 @@
-From fe301104656417e3c8e22538170a3fb75518e669 Mon Sep 17 00:00:00 2001
+From 1b443aab6b802b9a74a94d2a68f4ad2f6e77ce24 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
@ -9,7 +9,7 @@ Vanilla servers still error on negative/invalid packets.
 Original issue: https://github.com/WaterfallMC/Waterfall-Old/issues/11

 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index d36b7f3c..5e03e175 100644
+index 773e954c..57bd22b7 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -16,6 +16,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -93,10 +93,10 @@ index d1715b9c..0825a5a1 100644
 
         ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
 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 8979ac22..d4348eb7 100644
+index 04a3a73c..ef6b3ed6 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -73,6 +73,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -72,6 +72,7 @@ public final class UserConnection implements ProxiedPlayer
     @NonNull
     private final ProxyServer bungee;
     @NonNull
@ -122,5 +122,5 @@ index 23715f68..7d970ad8 100644
         {
             rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.33.0
+2.35.1

--- a/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch
@ -1,4 +1,4 @@
-From 7f0cf613be361f1370bad6bd97e28f7d2d6049ef Mon Sep 17 00:00:00 2001
+From 23c97f066c6eb8f118df992be1e785a25bf33011 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 0825a5a1..175150c7 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 d9facc62..dd742d01 100644
+index a047c8b7..f8691bc4 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
-@@ -674,6 +674,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -681,6 +681,6 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public String toString()
     {
@ -69,5 +69,5 @@ index 5b58fdea..af19796f 100644
     }
 }
 -- 
-2.33.0
+2.35.1

--- a/BungeeCord-Patches/0026-Improve-ServerKickEvent.patch
+++ b/BungeeCord-Patches/0026-Improve-ServerKickEvent.patch
@ -1,4 +1,4 @@
-From 8820915bd0c7783f42ac4f0eca4da2d9b03fe97d Mon Sep 17 00:00:00 2001
+From 4b776b6e9f93f2e3eb2d778afbacd11748a2c9b6 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,18 +75,10 @@ index 175150c7..5595278b 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 dd742d01..314b08bc 100644
+index f8691bc4..98bebb94 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
-@@ -12,6 +12,7 @@ import com.mojang.brigadier.context.StringRange;
- import com.mojang.brigadier.suggestion.Suggestion;
- import com.mojang.brigadier.suggestion.Suggestions;
- import com.mojang.brigadier.tree.LiteralCommandNode;
-+import java.util.Objects; // Waterfall
- import io.netty.buffer.ByteBuf;
- import io.netty.buffer.ByteBufAllocator;
- import io.netty.buffer.Unpooled;
-@@ -80,16 +81,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -87,16 +87,19 @@ public class DownstreamBridge extends PacketHandler
             return;
         }
 
@ -111,7 +103,7 @@ index dd742d01..314b08bc 100644
     }
 
     @Override
-@@ -104,7 +108,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -111,7 +114,19 @@ public class DownstreamBridge extends PacketHandler
 
         if ( !server.isObsolete() )
         {
@ -132,12 +124,12 @@ index dd742d01..314b08bc 100644
         }
 
         ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -558,7 +574,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -565,7 +580,11 @@ public class DownstreamBridge extends PacketHandler
     public void handle(Kick kick) throws Exception
     {
         ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
 -        ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTED ) );
-+        if ( Objects.equals( server.getInfo(), def ) )
+        if ( java.util.Objects.equals( server.getInfo(), def ) )
 +        {
 +            def = null;
 +        }
@ -146,5 +138,5 @@ index dd742d01..314b08bc 100644
         {
             con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.33.0
+2.35.1

--- a/BungeeCord-Patches/0028-Add-timeout-variant-to-connect-methods.patch
+++ b/BungeeCord-Patches/0028-Add-timeout-variant-to-connect-methods.patch
@ -1,4 +1,4 @@
-From 7b21c06283e4b06fbfd4ad6c50094a3a41233fa7 Mon Sep 17 00:00:00 2001
+From 66da094f64b5f5089a76994023ec6d0b53a695d2 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 e7ab62e5..684eb883 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 94ac3142..68c0f74f 100644
+index ef6b3ed6..61e1a9d7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -255,9 +255,20 @@ public final class UserConnection implements ProxiedPlayer
+@@ -254,9 +254,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 94ac3142..68c0f74f 100644
         if ( callback != null )
         {
             // Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
-@@ -351,7 +362,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -350,7 +361,7 @@ public final class UserConnection implements ProxiedPlayer
                     if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
                     {
                         sendMessage( bungee.getTranslation( "fallback_lobby" ) );
@ -109,5 +109,5 @@ index 94ac3142..68c0f74f 100644
                     {
                         disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
 -- 
-2.34.0
+2.35.1

--- a/BungeeCord-Patches/0031-Fix-potion-race-condition-on-Forge-1.8.9.patch
+++ b/BungeeCord-Patches/0031-Fix-potion-race-condition-on-Forge-1.8.9.patch
@ -1,4 +1,4 @@
-From abf53bfc51be02b7d0dc498174a7f78a58be28a2 Mon Sep 17 00:00:00 2001
+From 8bcabbb68cb6fbd827fecd2b96afd05107f6cd4a 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
@ -173,7 +173,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 a8f4378e..95dc97b9 100644
+index 61e1a9d7..2cbf002e 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 @@
@ -186,7 +186,7 @@ index a8f4378e..95dc97b9 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
+@@ -124,6 +126,10 @@ public final class UserConnection implements ProxiedPlayer
     private final Scoreboard serverSentScoreboard = new Scoreboard();
     @Getter
     private final Collection<UUID> sentBossBars = new HashSet<>();
@ -198,10 +198,10 @@ index a8f4378e..95dc97b9 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 314b08bc..b205cc0f 100644
+index 98bebb94..b5f8c473 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
-@@ -52,6 +52,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
+@@ -51,6 +51,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.ProtocolConstants;
 import net.md_5.bungee.protocol.packet.BossBar;
 import net.md_5.bungee.protocol.packet.Commands;
@ -210,7 +210,7 @@ index 314b08bc..b205cc0f 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;
-@@ -659,6 +661,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -665,6 +667,32 @@ public class DownstreamBridge extends PacketHandler
         }
     }
 
@ -281,5 +281,5 @@ index d15044f4..bea2bbff 100644
      * Sends the server mod list to the client, or stores it for sending later.
      *
 -- 
-2.30.1 (Apple Git-130)
+2.35.1

--- a/BungeeCord-Patches/0045-Provide-an-option-to-disable-entity-metadata-rewriti.patch
+++ b/BungeeCord-Patches/0045-Provide-an-option-to-disable-entity-metadata-rewriti.patch
@ -1,4 +1,4 @@
-From 90ea2cbbd4de639e9705f149d7d77ee528fc86f6 Mon Sep 17 00:00:00 2001
+From 077875d87eb6f03098bcd12615c74b6aab38a68c 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
@ -123,10 +123,10 @@ index 5595278b..9e74d158 100644
             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 af163836..871a2990 100644
+index 2cbf002e..17f68fd7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -765,4 +765,10 @@ public final class UserConnection implements ProxiedPlayer
+@@ -758,4 +758,10 @@ public final class UserConnection implements ProxiedPlayer
     {
         return serverSentScoreboard;
     }
@ -138,10 +138,10 @@ index af163836..871a2990 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 b205cc0f..9f7dd038 100644
+index b5f8c473..01b29247 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
-@@ -665,6 +665,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -671,6 +671,7 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public void handle(EntityEffect entityEffect) throws Exception
     {
@ -149,7 +149,7 @@ index b205cc0f..9f7dd038 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()) {
-@@ -676,6 +677,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -682,6 +683,7 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public void handle(EntityRemoveEffect removeEffect) throws Exception
     {
@ -234,5 +234,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.34.0
+2.35.1

--- a/BungeeCord-Patches/0046-Add-ProxyDefineCommandsEvent.patch
+++ b/BungeeCord-Patches/0046-Add-ProxyDefineCommandsEvent.patch
@ -1,4 +1,4 @@
-From b5bfb337c5c2ecd316ecdac721be5767e7ab3aac Mon Sep 17 00:00:00 2001
+From 50b4c8768067c05fd7eb4214b637b44cb294929d 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,20 +54,10 @@ 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 9f7dd038..4c70fc90 100644
+index 01b29247..e2adf3f2 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
-@@ -12,7 +12,8 @@ import com.mojang.brigadier.context.StringRange;
- import com.mojang.brigadier.suggestion.Suggestion;
- import com.mojang.brigadier.suggestion.Suggestions;
- import com.mojang.brigadier.tree.LiteralCommandNode;
-import java.util.Objects; // Waterfall
-+
-+import io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent; // Waterfall
- import io.netty.buffer.ByteBuf;
- import io.netty.buffer.ByteBufAllocator;
- import io.netty.buffer.Unpooled;
-@@ -20,8 +21,10 @@ import io.netty.channel.unix.DomainSocketAddress;
+@@ -19,8 +19,10 @@ import io.netty.channel.unix.DomainSocketAddress;
 import java.io.DataInput;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@ -78,7 +68,7 @@ index 9f7dd038..4c70fc90 100644
 import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.ServerConnection;
 import net.md_5.bungee.ServerConnection.KeepAliveData;
-@@ -700,9 +703,25 @@ public class DownstreamBridge extends PacketHandler
+@@ -706,9 +708,25 @@ public class DownstreamBridge extends PacketHandler
     {
         boolean modified = false;
 
@ -94,7 +84,7 @@ index 9f7dd038..4c70fc90 100644
 +            }
 +        }
 +
-+        ProxyDefineCommandsEvent event = new ProxyDefineCommandsEvent( this.server, this.con, commandMap );
+        io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent event = new io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent( this.server, this.con, commandMap );
 +        bungee.getPluginManager().callEvent( event );
 +
 +        for ( Map.Entry<String, Command> command : event.getCommands().entrySet() )
@ -104,8 +94,8 @@ index 9f7dd038..4c70fc90 100644
 +            if ( true ) // Moved up
 +            // Waterfall end
             {
-                 LiteralCommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() )
+                 CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
                         .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
 -- 
-2.30.1 (Apple Git-130)
+2.35.1

--- a/BungeeCord-Patches/0053-Allow-to-disable-tablist-rewrite.patch
+++ b/BungeeCord-Patches/0053-Allow-to-disable-tablist-rewrite.patch
@ -1,4 +1,4 @@
-From a925d96a2e97f8523665c76e57b2a2c6e0dddc4f Mon Sep 17 00:00:00 2001
+From 4c98b2b4f1fdbc9d0cee68d4a10235d256886e46 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..527f310e 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 4c70fc90..ef6214b1 100644
+index e2adf3f2..74575854 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
-@@ -162,8 +162,14 @@ public class DownstreamBridge extends PacketHandler
+@@ -167,8 +167,14 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public void handle(PlayerListItem playerList) throws Exception
     {
@ -71,5 +71,5 @@ index 4c70fc90..ef6214b1 100644
 
     @Override
 -- 
-2.30.1 (Apple Git-130)
+2.35.1

--- a/BungeeCord-Patches/0054-Remove-version-from-brand-info.patch
+++ b/BungeeCord-Patches/0054-Remove-version-from-brand-info.patch
@ -1,14 +1,14 @@
-From a61ec46ee3caa4bd08da67acc4bc62a19541d7a2 Mon Sep 17 00:00:00 2001
+From db63f4a157fa622cc50c402c3e701b4b4149bbb3 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 ef6214b1..d3650ff8 100644
+index 74575854..97c4b210 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
-@@ -294,7 +294,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -299,7 +299,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 ef6214b1..d3650ff8 100644
             brand.release();
             // changes in the packet are ignored so we need to send it manually
 -- 
-2.30.1 (Apple Git-130)
+2.35.1

--- a/BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch
+++ b/BungeeCord-Patches/0062-ServerConnectRequest-sendFeedback.patch
@ -1,4 +1,4 @@
-From 58b01511fca0b3add7805775d42b9ea4661396a2 Mon Sep 17 00:00:00 2001
+From 25da19dc4b4ca0bf9191889cfc23562f7e3035f9 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 871a2990..8e85f0e6 100644
+index 17f68fd7..4a858f31 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -268,12 +268,16 @@ public final class UserConnection implements ProxiedPlayer
+@@ -267,12 +267,16 @@ public final class UserConnection implements ProxiedPlayer
         connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
     }
 
@ -53,7 +53,7 @@ index 871a2990..8e85f0e6 100644
         builder.connectTimeout(timeout); // Waterfall
         if ( callback != null )
         {
-@@ -321,7 +325,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -320,7 +324,7 @@ public final class UserConnection implements ProxiedPlayer
                 callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
             }
 
@ -62,7 +62,7 @@ index 871a2990..8e85f0e6 100644
             return;
         }
         if ( pendingConnects.contains( target ) )
-@@ -331,7 +335,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -330,7 +334,7 @@ public final class UserConnection implements ProxiedPlayer
                 callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
             }
 
@ -71,7 +71,7 @@ index 871a2990..8e85f0e6 100644
             return;
         }
 
-@@ -367,14 +371,14 @@ public final class UserConnection implements ProxiedPlayer
+@@ -366,14 +370,14 @@ public final class UserConnection implements ProxiedPlayer
                     ServerInfo def = updateAndGetNextServer( target );
                     if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
                     {
@ -90,5 +90,5 @@ index 871a2990..8e85f0e6 100644
                 }
             }
 -- 
-2.35.0
+2.35.1