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: 78ca16df Minecraft 1.19.1 support adc32d5a #3367: Add linux aarch64 native epoll support 12e45148 #3355,#3357: Fix possible NPE's in LoginEvent & PreLoginEvent
2024-11-13 05:54:04 +01:00 · 2022-07-27 19:35:10 +01:00 · 2022-07-27 19:35:10 +01:00 · 097888c72a
commit 097888c72a
parent 47c4790542
19 changed files with 88 additions and 88 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 587fb37bdf3438708649c18c9271ec20bb36e74b
+Subproject commit 78ca16dfe3bf9a21d5c054a1884d4f5f198a62bc
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@ -1,4 +1,4 @@
-From 2878cc18bda9fe2749a957a38f844167cd04c302 Mon Sep 17 00:00:00 2001
+From 644492a2dee5339f68f17a5931b203f2753bf8eb 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
@ -772,7 +772,7 @@ index de6bd2e0..93ae5952 100644
             <scope>compile</scope>
         </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 5fd3a2ec..a6737787 100644
+index 08d132e8..cf0a6a99 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -799,7 +799,7 @@ index 5fd3a2ec..a6737787 100644
     <description>Proxy component of the Elastic Portal Suite</description>
 
     <properties>
-@@ -50,32 +50,32 @@
+@@ -57,32 +57,32 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
@ -884,5 +884,5 @@ index 5ea69b24..72eb14e2 100644
             <scope>compile</scope>
         </dependency>
 -- 
-2.32.1 (Apple Git-133)
+2.37.1

--- a/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
+++ b/BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
@ -1,14 +1,14 @@
-From 9023de96647d320da12a0d65285f26e18ef4385b Mon Sep 17 00:00:00 2001
+From b526187ee2b182930850ced2708a2770b669c949 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 18 Jul 2018 20:23:03 +0300
 Subject: [PATCH] Copy license files into jar


 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index a86eb68c..0202f4f0 100644
+index cf0a6a99..1d370c70 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
-@@ -117,4 +117,26 @@
+@@ -124,4 +124,26 @@
             <scope>runtime</scope>
         </dependency>
     </dependencies>
@ -36,5 +36,5 @@ index a86eb68c..0202f4f0 100644
 +    <!-- Waterfall end -->
 </project>
 -- 
-2.35.3
+2.37.1

--- a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
+++ b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
@ -1,14 +1,14 @@
-From 59757b0ed87cefeba419ab0aa1d8af45a30da6a9 Mon Sep 17 00:00:00 2001
+From 7568c27acbd910ea05e9408a796e54ad3c9b6ddd 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 180a5759..164b544e 100644
+index 0471b9a5..aa5daf47 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
-@@ -103,6 +103,16 @@ public class ProtocolConstants
+@@ -105,6 +105,16 @@ public class ProtocolConstants
         SUPPORTED_VERSION_IDS = supportedVersionIds.build();
     }
 
@ -26,5 +26,5 @@ index 180a5759..164b544e 100644
     {
 
 -- 
-2.35.3
+2.37.1

--- a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
+++ b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
@ -1,4 +1,4 @@
-From ded65c68dbb3e3e6142fe65ffa99b5f2fb34e03a Mon Sep 17 00:00:00 2001
+From 3abcc263d07ca4f3297170abbb7fe4fc3e373195 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 14 Mar 2016 15:40:44 -0700
 Subject: [PATCH] Optimize uuid conversions
@ -250,10 +250,10 @@ index 88d36ad2..fc92a7b5 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 c5365630..ba0fafff 100644
+index 74362ef9..94db72b0 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
-@@ -686,7 +686,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -712,7 +712,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
     @Override
     public String getUUID()
     {
@ -263,5 +263,5 @@ index c5365630..ba0fafff 100644
 
     @Override
 -- 
-2.32.1 (Apple Git-133)
+2.37.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 65e8e0bc2366c20b70bb861adc67b50c7fc17057 Mon Sep 17 00:00:00 2001
+From f7b0de343be482debb742d1a647ad83f82e32f03 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 38394808..c4434b24 100644
+index 04dc178d..03b6d132 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
-@@ -564,14 +564,23 @@ public enum Protocol
+@@ -582,14 +582,23 @@ public enum Protocol
             return protocol;
         }
 
@ -66,7 +66,7 @@ index 38394808..c4434b24 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 b71a2c35..0c036650 100644
+index 1255298c..aa721cdc 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -34,7 +34,9 @@ import net.md_5.bungee.forge.ForgeUtils;
@ -93,7 +93,7 @@ index b71a2c35..0c036650 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 f0fb7694..8268e30b 100644
+index d642e68d..bac51311 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
@ -105,10 +105,10 @@ index f0fb7694..8268e30b 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 81a1cfc3..45c2bea6 100644
+index dc949c66..fcf6788a 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
-@@ -330,6 +330,12 @@ public abstract class EntityMap
+@@ -332,6 +332,12 @@ public abstract class EntityMap
         int packetId = DefinedPacket.readVarInt( packet );
         int packetIdLength = packet.readerIndex() - readerIndex;
 
@ -122,5 +122,5 @@ index 81a1cfc3..45c2bea6 100644
         {
             rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.35.3
+2.37.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 8c7873b4e4451e63fd767c13fecbd271fb0dc1aa Mon Sep 17 00:00:00 2001
+From 63b50851ec7d18ca93f6d1e535e49fd465633ed6 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 0c036650..6b7aee66 100644
+index aa721cdc..981b0200 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -460,6 +460,6 @@ public class ServerConnector extends PacketHandler
@ -31,10 +31,10 @@ index a047c8b7..f8691bc4 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 ba0fafff..8c20449b 100644
+index 94db72b0..562afbaa 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
-@@ -692,20 +692,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -718,20 +718,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
     @Override
     public String toString()
     {
@ -69,5 +69,5 @@ index 147e5b20..d560cef6 100644
     }
 }
 -- 
-2.32.1 (Apple Git-133)
+2.37.1

--- a/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch
+++ b/BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch
@ -1,4 +1,4 @@
-From e23e1824d99060dac05dfa138a89cecf5920defd Mon Sep 17 00:00:00 2001
+From 23174941bfb0c6555ef478b0043823b1ba60594e Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sun, 7 Feb 2016 00:01:19 -0700
 Subject: [PATCH] Add a property to accept invalid ping packets
@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
 Fixes #23

 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 8c20449b..8fbd820e 100644
+index 562afbaa..fd03d152 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
-@@ -299,10 +299,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -300,10 +300,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
         thisState = State.PING;
     }
 
@ -29,5 +29,5 @@ index 8c20449b..8fbd820e 100644
         disconnect( "" );
     }
 -- 
-2.32.1 (Apple Git-133)
+2.37.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,11 +1,11 @@
-From f905ea8b649f836d74d32de87355c73670d0f419 Mon Sep 17 00:00:00 2001
+From 0db9e0d2e1a466e10fab4ba883ecb3991b36fdc4 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 35236382..558d0dbb 100644
+index 2658e144..bbfa05e9 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 35236382..558d0dbb 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
+@@ -208,4 +210,14 @@ public abstract class AbstractPacketHandler
     public void handle(GameState gameState) throws Exception
     {
     }
@ -33,7 +33,7 @@ index 35236382..558d0dbb 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 ad0c66a5..1b5189c1 100644
+index 03b6d132..71adb32c 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,9 +45,9 @@ index ad0c66a5..1b5189c1 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;
-@@ -133,6 +135,20 @@ public enum Protocol
-                     PlayerChat::new,
-                     map( ProtocolConstants.MINECRAFT_1_19, 0x30 )
+@@ -130,6 +132,20 @@ public enum Protocol
+                     map( ProtocolConstants.MINECRAFT_1_17, 0x0D ),
+                     map( ProtocolConstants.MINECRAFT_1_19, 0x0A )
             );
 +            // Waterfall start
 +            TO_CLIENT.registerPacket(
@ -268,5 +268,5 @@ index d15044f4..bea2bbff 100644
      * Sends the server mod list to the client, or stores it for sending later.
      *
 -- 
-2.36.1
+2.37.1

--- a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@ -1,4 +1,4 @@
-From b5a7047196c619df8ba429d26988c77eea5b679f Mon Sep 17 00:00:00 2001
+From c1690b6f6906281fb06aa0bb3f2184aa73f1b9d6 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -251,10 +251,10 @@ index fad424b6..2b544c23 100644
     </modules>
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 62444984..d81bf730 100644
+index c726cb18..1036a2e7 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
-@@ -71,7 +71,7 @@
+@@ -78,7 +78,7 @@
         </dependency>
         <dependency>
             <groupId>io.github.waterfallmc</groupId>
@ -263,7 +263,7 @@ index 62444984..d81bf730 100644
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-@@ -93,12 +93,13 @@
+@@ -100,12 +100,13 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
@ -278,7 +278,7 @@ index 62444984..d81bf730 100644
         <dependency>
             <groupId>net.sf.jopt-simple</groupId>
             <artifactId>jopt-simple</artifactId>
-@@ -130,6 +131,25 @@
+@@ -137,6 +138,25 @@
             <version>1.7.3</version>
             <scope>runtime</scope>
         </dependency>
@ -1616,5 +1616,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.36.1
+2.37.1

--- a/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
+++ b/BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
@ -1,4 +1,4 @@
-From 4b919fbfee76c472739751674934fb94e60cb229 Mon Sep 17 00:00:00 2001
+From b2a739fbebcd8447a6c8bd39d17c63780e8f616c Mon Sep 17 00:00:00 2001
 From: phenomax <phenomax@revayd.net>
 Date: Thu, 10 Aug 2017 18:41:17 +0200
 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@ -52,10 +52,10 @@ similarity index 100%
 rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
 rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
 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 8fbd820e..4346fb61 100644
+index fd03d152..2df797fa 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
-@@ -600,7 +600,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -626,7 +626,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
         };
 
         // fire login event
@ -65,5 +65,5 @@ index 8fbd820e..4346fb61 100644
 
     @Override
 -- 
-2.32.1 (Apple Git-133)
+2.37.1

--- a/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch
+++ b/BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch
@ -1,4 +1,4 @@
-From 663e69c551c1b12c383ea530e622702741deb2fc Mon Sep 17 00:00:00 2001
+From 08c670b50ba91f6d82cfdc8e35fca0e23bb88e8e Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Thu, 8 Feb 2018 19:10:52 +0100
 Subject: [PATCH] Optionally log InitialHandler connections
@ -61,10 +61,10 @@ index ef44d334..4ff8da6d 100644
     public String getGameVersion() {
         return gameVersion;
 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 4346fb61..28c799a8 100644
+index 2df797fa..1dc2ad3c 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
-@@ -353,7 +353,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -354,7 +354,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                 break;
             case 2:
                 // Login
@ -77,5 +77,5 @@ index 4346fb61..28c799a8 100644
                 ch.setProtocol( Protocol.LOGIN );
 
 -- 
-2.32.1 (Apple Git-133)
+2.37.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 5bd34a504bbe88b28d46ac24265c18f41a7c3627 Mon Sep 17 00:00:00 2001
+From 55af4745e71a2fff9fd35ebabc656b562a81788a 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
@ -57,7 +57,7 @@ index 4ff8da6d..e860214f 100644
 +    }
 }
 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 e29fdf9a..ba7fc59c 100644
+index 9bd063f5..8181d76b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -240,7 +240,7 @@ public class ServerConnector extends PacketHandler
@ -160,7 +160,7 @@ index b5f8c473..01b29247 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 45c2bea6..59d63cc2 100644
+index fcf6788a..1b639a23 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 45c2bea6..59d63cc2 100644
         switch ( version )
         {
             case ProtocolConstants.MINECRAFT_1_8:
-@@ -292,7 +297,13 @@ public abstract class EntityMap
+@@ -294,7 +299,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.36.1
+2.37.1

--- a/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch
+++ b/BungeeCord-Patches/0050-Speed-up-some-common-exceptions.patch
@ -1,4 +1,4 @@
-From 5aa22408113b9c0b0ccce71033c9521faf8abd84 Mon Sep 17 00:00:00 2001
+From b792a930ccd6e6d53c325b46076212ff24515b81 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
@ -146,10 +146,10 @@ 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 28c799a8..73291d98 100644
+index 1dc2ad3c..5331518b 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
-@@ -15,6 +15,8 @@ import java.util.Set;
+@@ -16,6 +16,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.logging.Level;
 import javax.crypto.SecretKey;
@ -158,7 +158,7 @@ index 28c799a8..73291d98 100644
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.BungeeCord;
-@@ -465,6 +467,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -470,6 +472,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
         Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
 
         SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644
 
             // Waterfall start
 -- 
-2.32.1 (Apple Git-133)
+2.37.1

--- a/BungeeCord-Patches/0055-Add-auth-url-option.patch
+++ b/BungeeCord-Patches/0055-Add-auth-url-option.patch
@ -1,14 +1,14 @@
-From 8be1b66e9dd818b0c2eae17c9fa689a421c9b4f3 Mon Sep 17 00:00:00 2001
+From 31819af9137d9e22392d3dee782a26d690651644 Mon Sep 17 00:00:00 2001
 From: theminecoder <theminecoder.dev@gmail.com>
 Date: Sun, 19 Jul 2020 10:18:23 +1000
 Subject: [PATCH] Add auth url option


 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 73291d98..23331fef 100644
+index 5331518b..5ee47b6a 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
-@@ -75,6 +75,8 @@ import net.md_5.bungee.util.QuietException;
+@@ -76,6 +76,8 @@ import net.md_5.bungee.util.QuietException;
 public class InitialHandler extends PacketHandler implements PendingConnection
 {
 
@ -17,7 +17,7 @@ index 73291d98..23331fef 100644
     private final BungeeCord bungee;
     private ChannelWrapper ch;
     @Getter
-@@ -493,7 +495,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -498,7 +500,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
         String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
 
         String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : "";
@ -27,5 +27,5 @@ index 73291d98..23331fef 100644
         Callback<String> handler = new Callback<String>()
         {
 -- 
-2.32.1 (Apple Git-133)
+2.37.1

--- a/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch
+++ b/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch
@ -1,4 +1,4 @@
-From b901ef5501cdc65df1f175d700576641063fdff4 Mon Sep 17 00:00:00 2001
+From 98f8f9fe6e5931287e3711324cf2055f8d13cfd2 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
@ -167,10 +167,10 @@ 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 8b148625..836b4722 100644
+index d9839973..682c8784 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
-@@ -45,4 +45,13 @@ public class LoginRequest extends DefinedPacket
+@@ -65,4 +65,13 @@ public class LoginRequest extends DefinedPacket
     {
         handler.handle( this );
     }
@ -235,5 +235,5 @@ index 738f0c92..ec33d337 100644
 +    // Waterfall end
 }
 -- 
-2.36.1
+2.37.1

--- a/BungeeCord-Patches/0060-Configurable-plugin-messaging-limits.patch
+++ b/BungeeCord-Patches/0060-Configurable-plugin-messaging-limits.patch
@ -1,4 +1,4 @@
-From e16ae67a7e63df323062bcfca6c0753c57817b3e Mon Sep 17 00:00:00 2001
+From b6595ae3586fe015b823d392774a510e5d807759 Mon Sep 17 00:00:00 2001
 From: FivePB <admin@fivepb.me>
 Date: Tue, 16 Nov 2021 21:15:32 +0100
 Subject: [PATCH] Configurable plugin messaging limits
@ -83,10 +83,10 @@ index b88e3c8a..da0efa36 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 23331fef..045367d0 100644
+index 5ee47b6a..4a8cb3df 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
-@@ -728,9 +728,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -754,9 +754,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
 
             for ( String id : content.split( "\0" ) )
             {
@ -101,5 +101,5 @@ index 23331fef..045367d0 100644
             }
         } else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
 -- 
-2.32.1 (Apple Git-133)
+2.37.1

--- a/BungeeCord-Patches/0063-Improve-login-state-transition.patch
+++ b/BungeeCord-Patches/0063-Improve-login-state-transition.patch
@ -1,14 +1,14 @@
-From 2e698622a4878492e35ab62f13a6cfc0ce6672bf Mon Sep 17 00:00:00 2001
+From 3f69c973c1887a0c1ee3763dd62460ded540dd54 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 8 May 2022 12:04:30 +0100
 Subject: [PATCH] Improve login state transition


 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 045367d0..24893418 100644
+index 4a8cb3df..6011078f 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
-@@ -467,6 +467,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -472,6 +472,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
     {
         Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
         Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
@ -16,7 +16,7 @@ index 045367d0..24893418 100644
 
         SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
         // Waterfall start
-@@ -521,7 +522,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -526,7 +527,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                 }
             }
         };
@ -26,5 +26,5 @@ index 045367d0..24893418 100644
     }
 
 -- 
-2.32.1 (Apple Git-133)
+2.37.1

--- a/BungeeCord-Patches/0064-Add-protocol-version-to-packet-not-found-message.patch
+++ b/BungeeCord-Patches/0064-Add-protocol-version-to-packet-not-found-message.patch
@ -1,4 +1,4 @@
-From d6845b93f7ca753a60b13ce6cae5bf6c4199461d Mon Sep 17 00:00:00 2001
+From 33eda5e5b22255416fdb33bdef016639d8126b7c 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 1b5189c1..f5a675a9 100644
+index 71adb32c..fb126a21 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 1b5189c1..f5a675a9 100644
 import gnu.trove.map.TIntObjectMap;
 import gnu.trove.map.TObjectIntMap;
 import gnu.trove.map.hash.TIntObjectHashMap;
-@@ -650,9 +652,12 @@ public enum Protocol
+@@ -668,9 +670,12 @@ public enum Protocol
             {
                 throw new BadPacketException( "Unsupported protocol version" );
             }
@ -34,5 +34,5 @@ index 1b5189c1..f5a675a9 100644
     }
 }
 -- 
-2.32.1 (Apple Git-133)
+2.37.1