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:
8a80435e Minecraft 1.21.4 support
20a71b06 Minecraft 1.21.4-rc3 support
b376f615 Minecraft 1.21.4-pre2 support
373dab05 Minecraft 1.21.4-pre1 support
f6b40b11 #3758: Handle LoginPayloadResponse in UpstreamBridge
81b118a8 #3759: Remove unnecessary protocol version check for UnsignedClientCommand
7a42f127 #3760: Fix possible NPE when trying to get encoder/decoder protocol

Author: electronicboy

BungeeCord

@@ -1,14 +1,14 @@
-From 1f600472dc962c517bdd8dd1f7f5572808263a88 Mon Sep 17 00:00:00 2001
+From 34fdda895db367f225f49d94a55a8f04aa89842f 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 86412d48..66609085 100644
+index b3d1c2bb..ad9aa920 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
-@@ -123,6 +123,16 @@ public class ProtocolConstants
+@@ -125,6 +125,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 
@@ -26,5 +26,5 @@ index 86412d48..66609085 100644
      {
 
 -- 
-2.47.0
+2.47.1
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,4 +1,4 @@
-From 093baa399deb298b579af81ebc95cc560bd188d4 Mon Sep 17 00:00:00 2001
+From d68066bbfc93431041ec0df01945032b0ae69f70 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
@@ -83,10 +83,10 @@ index 824166e5..b02121af 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 755b8fd6..699bbe3a 100644
+index 206bc8d2..fab7e9b9 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
-@@ -345,6 +345,12 @@ public abstract class EntityMap
+@@ -347,6 +347,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
 
@@ -100,5 +100,5 @@ index 755b8fd6..699bbe3a 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.47.0
+2.47.1
 

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

@@ -1,4 +1,4 @@
-From bd268bfef42ab87a581edb79d2fd4f47d665378b Mon Sep 17 00:00:00 2001
+From 7c3811f556c096bb26e777ee55bc51ee87d1cbd9 Mon Sep 17 00:00:00 2001
 From: Johannes Donath <[email protected]>
 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 c9e3697e..7ac9e6de 100644
+index 49967de9..0961c6e6 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
-@@ -51,6 +51,8 @@ public class UpstreamBridge extends PacketHandler
+@@ -52,6 +52,8 @@ public class UpstreamBridge extends PacketHandler
      private final ProxyServer bungee;
      private final UserConnection con;
 
@@ -85,7 +85,7 @@ index c9e3697e..7ac9e6de 100644
      public UpstreamBridge(ProxyServer bungee, UserConnection con)
      {
          this.bungee = bungee;
-@@ -231,6 +233,20 @@ public class UpstreamBridge extends PacketHandler
+@@ -232,6 +234,20 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public void handle(TabCompleteRequest tabComplete) throws Exception
      {
@@ -107,5 +107,5 @@ index c9e3697e..7ac9e6de 100644
          boolean isRegisteredCommand = false;
          boolean isCommand = tabComplete.getCursor().startsWith( "/" );
 -- 
-2.47.0
+2.47.1
 

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

@@ -1,4 +1,4 @@
-From 6a3372622d017776aec8f1ddca2987fbf4435cd8 Mon Sep 17 00:00:00 2001
+From 67530bdaa956440c3c8a7f8a9b37e0b6a1ac62e5 Mon Sep 17 00:00:00 2001
 From: Janmm14 <[email protected]>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Improve server list ping logging
@@ -31,7 +31,7 @@ index b501f7bd..1c075a9f 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 b7d7e71a..72f6111e 100644
+index 1679e6ab..aaae7afa 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
 @@ -829,20 +829,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -57,10 +57,10 @@ index b7d7e71a..72f6111e 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 7ac9e6de..0a020ffc 100644
+index 0961c6e6..e61fcc88 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
-@@ -397,6 +397,6 @@ public class UpstreamBridge extends PacketHandler
+@@ -404,6 +404,6 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -69,5 +69,5 @@ index 7ac9e6de..0a020ffc 100644
      }
  }
 -- 
-2.47.0
+2.47.1
 

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

@@ -1,4 +1,4 @@
-From 2bdd9d8ae204e2645bbb2cb9fb07e45800f9c710 Mon Sep 17 00:00:00 2001
+From f5e7fcd4863418a7b0359249106b0c2587c90e75 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Fri, 18 Mar 2016 10:53:24 -0700
 Subject: [PATCH] Better Decompression Sanity
@@ -45,10 +45,10 @@ index 445ee947..eaedf4bc 100644
                  out.add( decompressed );
                  decompressed = null;
 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
-index 682bb807..e0a35f73 100644
+index a15ba5df..032b06d4 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
-@@ -185,7 +185,7 @@ public class ChannelWrapper
+@@ -194,7 +194,7 @@ public class ChannelWrapper
 
          if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold >= 0 )
          {
@@ -58,5 +58,5 @@ index 682bb807..e0a35f73 100644
          if ( compressionThreshold < 0 )
          {
 -- 
-2.47.0
+2.47.1
 

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

@@ -1,4 +1,4 @@
-From 96e88d4ac24e1ba6941f1d4f070ec88db6c67ad9 Mon Sep 17 00:00:00 2001
+From d56d099214f23d6e792a9cdb9a346776ac5e4abe Mon Sep 17 00:00:00 2001
 From: Ichbinjoe <[email protected]>
 Date: Sat, 16 Jul 2016 20:44:01 -0400
 Subject: [PATCH] Add timeout variant to connect methods
@@ -75,10 +75,10 @@ index 0fe647b8..32af4937 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 52bca3e9..36582d85 100644
+index 7fcb3e2b..bf45501a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -285,9 +285,20 @@ public final class UserConnection implements ProxiedPlayer
+@@ -299,9 +299,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 52bca3e9..36582d85 100644
          if ( callback != null )
          {
              // Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
-@@ -382,7 +393,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -396,7 +407,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 52bca3e9..36582d85 100644
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
 -- 
-2.47.0
+2.47.1
 

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

@@ -1,4 +1,4 @@
-From e940da46ebd2e126da2b76a536e8ef77b206eb54 Mon Sep 17 00:00:00 2001
+From e9d1882ff4461d7b04050b9d356aa7c4e40faf69 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
@@ -123,10 +123,10 @@ index 661c6563..cc5afa04 100644
                      (byte) 0, login.getDeathLocation(), login.getPortalCooldown(), login.getSeaLevel() ) );
              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 df160672..a84f9b12 100644
+index 05116ba0..dd215795 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -821,4 +821,9 @@ public final class UserConnection implements ProxiedPlayer
+@@ -835,4 +835,9 @@ public final class UserConnection implements ProxiedPlayer
 
          unsafe().sendPacket( new Transfer( host, port ) );
      }
@@ -157,7 +157,7 @@ index a9258264..da3db022 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 699bbe3a..0f9f5957 100644
+index fab7e9b9..84a090b9 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
@@ -172,7 +172,7 @@ index 699bbe3a..0f9f5957 100644
          switch ( version )
          {
              case ProtocolConstants.MINECRAFT_1_8:
-@@ -307,7 +312,13 @@ public abstract class EntityMap
+@@ -309,7 +314,13 @@ public abstract class EntityMap
                      DefinedPacket.readVarInt( packet );
                      break;
                  default:
@@ -225,5 +225,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.47.0
+2.47.1
 

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

@@ -1,4 +1,4 @@
-From 8ad2dc138d2ee4a68720ce6b179dfb75f8d96c22 Mon Sep 17 00:00:00 2001
+From 757eca1274c57f81da94d49198a6d1edbace28b0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 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 a84f9b12..951fa17d 100644
+index dd215795..d1089058 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -298,12 +298,16 @@ public final class UserConnection implements ProxiedPlayer
+@@ -312,12 +312,16 @@ public final class UserConnection implements ProxiedPlayer
          connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
      }
 
@@ -53,7 +53,7 @@ index a84f9b12..951fa17d 100644
          builder.connectTimeout(timeout); // Waterfall
          if ( callback != null )
          {
-@@ -352,7 +356,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -366,7 +370,7 @@ public final class UserConnection implements ProxiedPlayer
                  callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
              }
 
@@ -62,7 +62,7 @@ index a84f9b12..951fa17d 100644
              return;
          }
          if ( pendingConnects.contains( target ) )
-@@ -362,7 +366,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -376,7 +380,7 @@ public final class UserConnection implements ProxiedPlayer
                  callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
              }
 
@@ -71,7 +71,7 @@ index a84f9b12..951fa17d 100644
              return;
          }
 
-@@ -398,14 +402,14 @@ public final class UserConnection implements ProxiedPlayer
+@@ -412,14 +416,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 a84f9b12..951fa17d 100644
                  }
              }
 -- 
-2.47.0
+2.47.1
 

BungeeCord-Patches/0057-ServerConnectRequest-sendFeedback.patch

@@ -1,4 +1,4 @@
-From 889fe24a64472d2f23786c4dcad5ed59aa5d6736 Mon Sep 17 00:00:00 2001
+From 889170a92f467a92095efe6d8f15d227ebd1d3dc Mon Sep 17 00:00:00 2001
 From: Shane Freeder <[email protected]>
 Date: Tue, 22 Mar 2022 14:56:44 +0000
 Subject: [PATCH] Don't send exceptions to the client during kicks, etc
@@ -13,10 +13,10 @@ allows for retaining much of the overall context here, i.e. who
 was this exception assocated with?
 
 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 951fa17d..e98bf147 100644
+index d1089058..7262a514 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -430,7 +430,8 @@ public final class UserConnection implements ProxiedPlayer
+@@ -444,7 +444,8 @@ public final class UserConnection implements ProxiedPlayer
 
      private String connectionFailMessage(Throwable cause)
      {
@@ -27,5 +27,5 @@ index 951fa17d..e98bf147 100644
 
      @Override
 -- 
-2.47.0
+2.47.1