diff --git a/BungeeCord b/BungeeCord
index 8b195d1d..acb85e30 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 8b195d1d2124f18f795d9d6fa8a44bb28c930361
+Subproject commit acb85e30faf3aa10d21ab51efa8fe478f13b8361
diff --git a/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch b/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch
index bae7024a..a69ac4ab 100644
--- a/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch
+++ b/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch
@@ -1,4 +1,4 @@
-From f2f55cb7743a44bc8d0db757315cbfab4d43f22f Mon Sep 17 00:00:00 2001
+From bb63e70de301f4cb8bc2ee1b72e074c7a9338582 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:34:52 -0700
 Subject: [PATCH] Fetch modules from the Waterfall API endpoint
@@ -6,7 +6,7 @@ Subject: [PATCH] Fetch modules from the Waterfall API endpoint
 Don't fetch from the BungeeCord CI, as that only has their modules
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
-index 2536435c..5bb86152 100644
+index 064639f3..2337f615 100644
 --- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
 +++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
 @@ -1,10 +1,10 @@
@@ -21,9 +21,9 @@ index 2536435c..5bb86152 100644
 +import java.nio.file.StandardCopyOption;
  import lombok.Data;
  import net.md_5.bungee.Util;
- 
-@@ -18,13 +18,21 @@ public class JenkinsModuleSource implements ModuleSource
-         System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
+ import net.md_5.bungee.api.ProxyServer;
+@@ -19,14 +19,22 @@ public class JenkinsModuleSource implements ModuleSource
+         ProxyServer.getInstance().getLogger().info( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
          try
          {
 -            URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
@@ -42,10 +42,12 @@ index 2536435c..5bb86152 100644
 +            con.setRequestProperty( "User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36" );
  
 -            Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
+-            ProxyServer.getInstance().getLogger().info( "Download complete" );
 +            Files.copy( con.getInputStream(), module.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING );
-             System.out.println( "Download complete" );
++            System.out.println( "Download complete" );
          } catch ( IOException ex )
          {
+             ProxyServer.getInstance().getLogger().warning( "Failed to download: " + Util.exception( ex ) );
 -- 
-2.43.0
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
index 7af986ad..92738993 100644
--- a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
+++ b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
@@ -1,14 +1,14 @@
-From d3093e6e77a840c31a9d064743bb06d0cac74987 Mon Sep 17 00:00:00 2001
+From 74a53eaee97d08fc03afd24ba8fab7a29b780db0 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 82ef4c5d..ef45ea31 100644
+index 9028dc13..73eff9ed 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
-@@ -121,6 +121,16 @@ public class ProtocolConstants
+@@ -122,6 +122,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
  
@@ -26,5 +26,5 @@ index 82ef4c5d..ef45ea31 100644
      {
  
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
index 46ef89d3..c32b50f1 100644
--- a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
+++ b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
@@ -1,4 +1,4 @@
-From fb960e8c0e54f29fc650000f64df2e131a35bae9 Mon Sep 17 00:00:00 2001
+From 4e53258f08ecc825ce2f292f71ef5cc74f33ba84 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 e582808f..29cd91dd 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 1d9a9ee5..616adcf1 100644
+index 224f231b..b7d7e71a 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
-@@ -806,7 +806,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -823,7 +823,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {
@@ -263,5 +263,5 @@ index 1d9a9ee5..616adcf1 100644
  
      @Override
 -- 
-2.44.0.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0013-Enable-TCP_NODELAY.patch b/BungeeCord-Patches/0013-Enable-TCP_NODELAY.patch
index ef13fd01..8d136f8e 100644
--- a/BungeeCord-Patches/0013-Enable-TCP_NODELAY.patch
+++ b/BungeeCord-Patches/0013-Enable-TCP_NODELAY.patch
@@ -1,4 +1,4 @@
-From d18340b80a0374b23b4b6658af9c09ce817c1691 Mon Sep 17 00:00:00 2001
+From 18f17a842d00c85ea1c7191196f43f6a66d0a640 Mon Sep 17 00:00:00 2001
 From: Harry <me@harry5573.uk>
 Date: Sun, 24 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Enable TCP_NODELAY.
@@ -6,10 +6,10 @@ Subject: [PATCH] Enable TCP_NODELAY.
 This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index 544d34ed..6a0d3351 100644
+index 380b6012..f1fce77b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-@@ -195,6 +195,7 @@ public class PipelineUtils
+@@ -194,6 +194,7 @@ public class PipelineUtils
              {
                  // IP_TOS is not supported (Windows XP / Windows Server 2003)
              }
@@ -18,5 +18,5 @@ index 544d34ed..6a0d3351 100644
              ch.config().setWriteBufferWaterMark( MARK );
  
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0015-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0015-Allow-invalid-packet-ids-for-forge-servers.patch
index c1fa7098..d850b645 100644
--- a/BungeeCord-Patches/0015-Allow-invalid-packet-ids-for-forge-servers.patch
+++ b/BungeeCord-Patches/0015-Allow-invalid-packet-ids-for-forge-servers.patch
@@ -1,4 +1,4 @@
-From cb1c3f31d81392c174068578a8ae931b10a525b5 Mon Sep 17 00:00:00 2001
+From 52d3157c6b8782b2f1d60c750c41bb369cab67c1 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -37,10 +37,10 @@ index d79d5e5c..250e7620 100644
              {
                  packet.read( in, protocol, prot.getDirection(), protocolVersion );
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index 317fb2d4..db50f379 100644
+index 35712217..b310ab1e 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
-@@ -884,14 +884,23 @@ public enum Protocol
+@@ -913,14 +913,23 @@ public enum Protocol
              return protocol;
          }
  
@@ -66,7 +66,7 @@ index 317fb2d4..db50f379 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 7a211f1b..a25a493e 100644
+index 99a539fb..e192e09e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -234,6 +234,12 @@ public class ServerConnector extends PacketHandler
@@ -83,10 +83,10 @@ index 7a211f1b..a25a493e 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 70b58fab..0045a449 100644
+index 755b8fd6..699bbe3a 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
-@@ -343,6 +343,12 @@ public abstract class EntityMap
+@@ -345,6 +345,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
  
@@ -100,5 +100,5 @@ index 70b58fab..0045a449 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0017-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0017-Improve-server-list-ping-logging.patch
index 00f3c5f3..f759f02d 100644
--- a/BungeeCord-Patches/0017-Improve-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0017-Improve-server-list-ping-logging.patch
@@ -1,4 +1,4 @@
-From f85ac2fff95f74a284ba4054e73d186d384c0bad Mon Sep 17 00:00:00 2001
+From dc4f3bf23c46e3461fda2d4a1ad71b04f5520181 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,10 +7,10 @@ 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 a25a493e..63920e7e 100644
+index e192e09e..3ee16609 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -522,6 +522,6 @@ public class ServerConnector extends PacketHandler
+@@ -521,6 +521,6 @@ public class ServerConnector extends PacketHandler
      @Override
      public String toString()
      {
@@ -31,10 +31,10 @@ 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 616adcf1..0fbe8b0d 100644
+index b7d7e71a..72f6111e 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
-@@ -812,20 +812,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -829,20 +829,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {
@@ -69,5 +69,5 @@ index bfd5cb5f..2dafa4d9 100644
      }
  }
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0018-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0018-Add-a-property-to-accept-invalid-ping-packets.patch
index 6b9691a4..052e04ea 100644
--- a/BungeeCord-Patches/0018-Add-a-property-to-accept-invalid-ping-packets.patch
+++ b/BungeeCord-Patches/0018-Add-a-property-to-accept-invalid-ping-packets.patch
@@ -1,4 +1,4 @@
-From 78524508576e2e5b6238d1f032b0e85c1a66f1f9 Mon Sep 17 00:00:00 2001
+From cfbe87c2b7227e70ca01313b8987382afdaaa877 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 0fbe8b0d..deb9fef3 100644
+index 72f6111e..fd577788 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
-@@ -325,10 +325,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -333,10 +333,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          thisState = State.PING;
      }
  
@@ -29,5 +29,5 @@ index 0fbe8b0d..deb9fef3 100644
          disconnect( "" );
      }
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0020-Better-Decompression-Sanity.patch b/BungeeCord-Patches/0020-Better-Decompression-Sanity.patch
index 6155ba24..a2ac8ea7 100644
--- a/BungeeCord-Patches/0020-Better-Decompression-Sanity.patch
+++ b/BungeeCord-Patches/0020-Better-Decompression-Sanity.patch
@@ -1,4 +1,4 @@
-From aa142880fb007f1f6b5c98ef015a795650ce02ca Mon Sep 17 00:00:00 2001
+From 8d60c27628af80ae7ad47a7547446673f3b0f10f Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 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 e8d5ed19..00e03bae 100644
+index 682bb807..e0a35f73 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
-@@ -181,7 +181,7 @@ public class ChannelWrapper
+@@ -185,7 +185,7 @@ public class ChannelWrapper
  
          if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold >= 0 )
          {
@@ -58,5 +58,5 @@ index e8d5ed19..00e03bae 100644
          if ( compressionThreshold < 0 )
          {
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0024-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0024-Improve-ServerKickEvent.patch
index fde54ed2..a3836592 100644
--- a/BungeeCord-Patches/0024-Improve-ServerKickEvent.patch
+++ b/BungeeCord-Patches/0024-Improve-ServerKickEvent.patch
@@ -1,4 +1,4 @@
-From 563bd03606a290b8321f36934b12c57902909530 Mon Sep 17 00:00:00 2001
+From c44fb8ec42deae2b04563fee66642b15d20e41ed 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
@@ -68,10 +68,10 @@ index 3f9efaa8..5d2597ad 100644
      /**
       * @return the kick reason
 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 63920e7e..e10f33ad 100644
+index 3ee16609..a928acd1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -439,7 +439,7 @@ public class ServerConnector extends PacketHandler
+@@ -438,7 +438,7 @@ public class ServerConnector extends PacketHandler
          ServerKickEvent event = new ServerKickEvent( user, target, new BaseComponent[]
          {
              kick.getMessage()
@@ -164,5 +164,5 @@ index 1c075a9f..23c34eff 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
index 8af2826d..47eaf3f7 100644
--- a/BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@@ -1,4 +1,4 @@
-From 4f8c5cb5bace2a92578dd41227ed91a173e4b58c Mon Sep 17 00:00:00 2001
+From dfe7d56fc75749c2f9ff0d290ea850619bd38344 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
@@ -509,19 +509,6 @@ index 3e5ca394..00000000
 -        return ( lastSpace == -1 ) ? cursor - buffer.length() : cursor - ( buffer.length() - lastSpace - 1 );
 -    }
 -}
-diff --git a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
-index 9ec4920e..d3abee44 100644
---- a/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
-+++ b/proxy/src/main/java/net/md_5/bungee/module/ModuleManager.java
-@@ -44,7 +44,7 @@ public class ModuleManager
-         ModuleVersion bungeeVersion = ModuleVersion.parse( proxy.getVersion() );
-         if ( bungeeVersion == null )
-         {
--            System.out.println( "Couldn't detect bungee version. Custom build?" );
-+            proxy.getLogger().warning( "Couldn't detect bungee version. Custom build?" ); // Waterfall - Use logger
-             return;
-         }
- 
 diff --git a/slf4j/nb-configuration.xml b/slf4j/nb-configuration.xml
 deleted file mode 100644
 index 7e465924..00000000
@@ -1629,5 +1616,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch b/BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch
index f20c8f67..3eaadd52 100644
--- a/BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch
+++ b/BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch
@@ -1,4 +1,4 @@
-From 18d2f5e44e0ebd0a61ee9e77b7c7b361e3d207c0 Mon Sep 17 00:00:00 2001
+From 4718337b23a598add2368142ace917cbb0d9de7f 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 05261ccf..fcd973e5 100644
+index 1a6b7ae3..d6872035 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
-@@ -388,7 +388,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -396,7 +396,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
              case 3:
                  transferred = handshake.getRequestedProtocol() == 3;
                  // Login
@@ -77,5 +77,5 @@ index 05261ccf..fcd973e5 100644
                  ch.setProtocol( Protocol.LOGIN );
  
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0043-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0043-Provide-an-option-to-disable-entity-metadata-rewriti.patch
index 752fe686..44600e83 100644
--- a/BungeeCord-Patches/0043-Provide-an-option-to-disable-entity-metadata-rewriti.patch
+++ b/BungeeCord-Patches/0043-Provide-an-option-to-disable-entity-metadata-rewriti.patch
@@ -1,4 +1,4 @@
-From 10e895f877cd54f501d86e79a511e3fae6ed71c6 Mon Sep 17 00:00:00 2001
+From a76b8308c0e7df03aa244e5d4f48293295e72a54 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 e10f33ad..c0c523e3 100644
+index a928acd1..c1766f6f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -264,7 +264,8 @@ public class ServerConnector extends PacketHandler
@@ -94,7 +94,7 @@ index e10f33ad..c0c523e3 100644
 +            if ( !user.isDisableEntityMetadataRewrite() && login.getDimension() == user.getDimension() ) // Waterfall - defer
              {
                  user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(),
-                         (byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
+                         (byte) 0, login.getDeathLocation(), login.getPortalCooldown(), login.getSeaLevel() ) );
              }
  
              user.setServerEntityId( login.getEntityId() );
@@ -120,13 +120,13 @@ index e10f33ad..c0c523e3 100644
 +            }
 +            // Waterfall end
              user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(),
-                     (byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
+                     (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 d15f2bcc..b8762fc0 100644
+index e09f49be..0e63ffea 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
+@@ -820,4 +820,9 @@ public final class UserConnection implements ProxiedPlayer
  
          unsafe().sendPacket( new Transfer( host, port ) );
      }
@@ -157,7 +157,7 @@ index 9971f93e..e82ef706 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 0045a449..39eab669 100644
+index 699bbe3a..0f9f5957 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 0045a449..39eab669 100644
          switch ( version )
          {
              case ProtocolConstants.MINECRAFT_1_8:
-@@ -305,7 +310,13 @@ public abstract class EntityMap
+@@ -307,7 +312,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.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0046-OSX-native-zlib-and-crypto.patch b/BungeeCord-Patches/0046-OSX-native-zlib-and-crypto.patch
index 96b9a49f..8e3d46c9 100644
--- a/BungeeCord-Patches/0046-OSX-native-zlib-and-crypto.patch
+++ b/BungeeCord-Patches/0046-OSX-native-zlib-and-crypto.patch
@@ -1,16 +1,16 @@
-From 5ea6ad7cd865bec92737ce8a665144ce1077c86e Mon Sep 17 00:00:00 2001
+From 746aa6d9c90eca0a17d6dcd030787ac9e1174440 Mon Sep 17 00:00:00 2001
 From: Colin Godsey <crgodsey@gmail.com>
 Date: Tue, 16 Apr 2019 07:25:52 -0600
 Subject: [PATCH] OSX native zlib and crypto
 
 
 diff --git a/native/compile-native.sh b/native/compile-native.sh
-index 5b6e54c4..1ea919cc 100755
+index a47bc812..744b7150 100755
 --- a/native/compile-native.sh
 +++ b/native/compile-native.sh
-@@ -8,20 +8,17 @@ echo "Compiling mbedtls"
+@@ -10,20 +10,17 @@ echo "Compiling mbedtls"
  echo "Compiling zlib"
- (cd zlib && CFLAGS=-fPIC ./configure --static && make)
+ (cd zlib && CFLAGS="-fPIC -DNO_GZIP" ./configure --static && make)
  
 -CC="gcc"
 -CFLAGS="-c -fPIC -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/"
@@ -41,13 +41,13 @@ index 5b6e54c4..1ea919cc 100755
 +$CXX -Imbedtls/include src/main/c/NativeCipherImpl.cpp -o src/main/resources/${PREFIX:-}native-cipher.so mbedtls/library/libmbedcrypto.a $CXX_ARGS
 +$CXX -Izlib src/main/c/NativeCompressImpl.cpp -o src/main/resources/${PREFIX:-}native-compress.so zlib/libz.a $CXX_ARGS
 diff --git a/native/src/main/c/NativeCipherImpl.c b/native/src/main/c/NativeCipherImpl.c
-index 727a2f1f..a0b9319b 100644
+index 020aaa1d..563c8adc 100644
 --- a/native/src/main/c/NativeCipherImpl.c
 +++ b/native/src/main/c/NativeCipherImpl.c
-@@ -5,6 +5,14 @@
- #include "shared.h"
- #include "net_md_5_bungee_jni_cipher_NativeCipherImpl.h"
+@@ -7,6 +7,13 @@
  
+ // Hack to keep the compiler from optimizing the memset away
+ static void *(*const volatile memset_func)(void *, int, size_t) = memset;
 +// Support for CentOS 6
 +#if __linux__ // Waterfall
 +__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
@@ -55,16 +55,15 @@ index 727a2f1f..a0b9319b 100644
 +    return memcpy(dest, src, n);
 +}
 +#endif // Waterfall
-+
+ 
  typedef unsigned char byte;
  
- typedef struct crypto_context {
 diff --git a/native/src/main/c/NativeCompressImpl.c b/native/src/main/c/NativeCompressImpl.c
-index 7fb8e6b9..64402246 100644
+index dee50c6a..7f91b9b9 100644
 --- a/native/src/main/c/NativeCompressImpl.c
 +++ b/native/src/main/c/NativeCompressImpl.c
-@@ -5,6 +5,14 @@
- #include "shared.h"
+@@ -8,6 +8,14 @@
+ #endif
  #include "net_md_5_bungee_jni_zlib_NativeCompressImpl.h"
  
 +// Support for CentOS 6
@@ -79,23 +78,42 @@ index 7fb8e6b9..64402246 100644
  
  static jclass classID;
 diff --git a/native/src/main/java/net/md_5/bungee/jni/NativeCode.java b/native/src/main/java/net/md_5/bungee/jni/NativeCode.java
-index 62bdaa0e..f4f6e6ab 100644
+index 4426823c..05ca22b1 100644
 --- a/native/src/main/java/net/md_5/bungee/jni/NativeCode.java
 +++ b/native/src/main/java/net/md_5/bungee/jni/NativeCode.java
-@@ -20,6 +20,7 @@ public final class NativeCode<T>
+@@ -27,6 +27,7 @@ public final class NativeCode<T>
  
-     public NativeCode(String name, Supplier<? extends T> javaImpl, Supplier<? extends T> nativeImpl)
+     public NativeCode(String name, Supplier<? extends T> javaImpl, Supplier<? extends T> nativeImpl, boolean extendedSupportCheck)
      {
 +        if ("Mac OS X".equals( System.getProperty( "os.name" ))) name = "osx-" + name; // Waterfall
          this.name = name;
          this.javaImpl = javaImpl;
          this.nativeImpl = nativeImpl;
-@@ -75,6 +76,6 @@ public final class NativeCode<T>
+@@ -95,16 +96,19 @@ public final class NativeCode<T>
  
      public static boolean isSupported()
      {
--        return "Linux".equals( System.getProperty( "os.name" ) ) && "amd64".equals( System.getProperty( "os.arch" ) );
-+        return ("Linux".equals( System.getProperty( "os.name" ) ) || "Mac OS X".equals( System.getProperty( "os.name" ) )) && ("amd64".equals( System.getProperty( "os.arch" ) ) || "x86_64".equals( System.getProperty( "os.arch" )) ); // Waterfall
+-        return "Linux".equals( System.getProperty( "os.name" ) ) && ( isAmd64() || isAarch64() );
++        String osName = System.getProperty("os.name");
++        String osArch = System.getProperty("os.arch");
++    
++        return ("Linux".equals(osName) || "Mac OS X".equals(osName)) && (isAmd64(osArch) || isAarch64(osArch));
+     }
+-
+-    private static boolean isAmd64()
++    
++    private static boolean isAmd64(String osArch)
+     {
+-        return "amd64".equals( System.getProperty( "os.arch" ) );
++        return "amd64".equals(osArch) || "x86_64".equals(osArch);
+     }
+-
+-    private static boolean isAarch64()
++    
++    private static boolean isAarch64(String osArch)
+     {
+-        return "aarch64".equals( System.getProperty( "os.arch" ) );
++        return "aarch64".equals(osArch);
      }
  }
 diff --git a/native/src/main/resources/osx-native-cipher.so b/native/src/main/resources/osx-native-cipher.so
@@ -1231,5 +1249,5 @@ literal 0
 HcmV?d00001
 
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch b/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
index b77bb75a..d9bf1316 100644
--- a/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
+++ b/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
@@ -1,4 +1,4 @@
-From 7f836748d1e320f6c48bc66d1545c568c477b0f3 Mon Sep 17 00:00:00 2001
+From 2a04fe112156cb510916bccd0784ace8cb81b78e 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
@@ -172,10 +172,10 @@ index 237955ab..d0bd4d75 100644
 +    // Waterfall end
  }
 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 fcd973e5..473edd76 100644
+index d6872035..a7241527 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
-@@ -21,6 +21,8 @@ import javax.crypto.SecretKey;
+@@ -23,6 +23,8 @@ import javax.crypto.SecretKey;
  import lombok.AllArgsConstructor;
  import lombok.Data;
  import lombok.EqualsAndHashCode;
@@ -184,7 +184,7 @@ index fcd973e5..473edd76 100644
  import lombok.Getter;
  import lombok.RequiredArgsConstructor;
  import lombok.ToString;
-@@ -510,6 +512,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -518,6 +520,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
  
          SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
@@ -221,5 +221,5 @@ index ac99d02c..0c1ecfb8 100644
  
              // Waterfall start
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0052-Add-auth-url-option.patch b/BungeeCord-Patches/0052-Add-auth-url-option.patch
index 40d80038..1b11d36d 100644
--- a/BungeeCord-Patches/0052-Add-auth-url-option.patch
+++ b/BungeeCord-Patches/0052-Add-auth-url-option.patch
@@ -1,14 +1,14 @@
-From 7543749df675aa43837ba960306c5dbec5aa2341 Mon Sep 17 00:00:00 2001
+From cc4ccd38b78576ded81ca48680a7d630b30d00f4 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 473edd76..d095e5f9 100644
+index a7241527..e3a1f744 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
-@@ -83,6 +83,8 @@ import net.md_5.bungee.util.QuietException;
+@@ -87,6 +87,8 @@ import net.md_5.bungee.util.QuietException;
  public class InitialHandler extends PacketHandler implements PendingConnection
  {
  
@@ -17,7 +17,7 @@ index 473edd76..d095e5f9 100644
      private final BungeeCord bungee;
      private ChannelWrapper ch;
      @Getter
-@@ -538,7 +540,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -548,7 +550,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 473edd76..d095e5f9 100644
          Callback<String> handler = new Callback<String>()
          {
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch b/BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch
index 65ff30f0..1ca97683 100644
--- a/BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch
+++ b/BungeeCord-Patches/0056-Configurable-plugin-messaging-limits.patch
@@ -1,4 +1,4 @@
-From 36ac86e4291f59fe9f7f992ef59edfc5a7890b16 Mon Sep 17 00:00:00 2001
+From da0d864f367562228ffb26689d88f28e59954060 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 d095e5f9..864cb119 100644
+index e3a1f744..bbaf947f 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
-@@ -848,9 +848,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -865,9 +865,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
  
              for ( String id : content.split( "\0" ) )
              {
@@ -101,5 +101,5 @@ index d095e5f9..864cb119 100644
              }
          } else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0059-Improve-login-state-transition.patch b/BungeeCord-Patches/0059-Improve-login-state-transition.patch
index d18f2d05..eca6ac56 100644
--- a/BungeeCord-Patches/0059-Improve-login-state-transition.patch
+++ b/BungeeCord-Patches/0059-Improve-login-state-transition.patch
@@ -1,14 +1,14 @@
-From 7cf8924ad0919269ed92a5a3cc6d08022e4a4362 Mon Sep 17 00:00:00 2001
+From 2c22606248484c62fe5895b2da686fda54d80d31 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 864cb119..6344462c 100644
+index bbaf947f..37715ba9 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
-@@ -512,6 +512,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -520,6 +520,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 864cb119..6344462c 100644
  
          SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
          // Waterfall start
-@@ -566,7 +567,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -576,7 +577,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                  }
              }
          };
@@ -26,5 +26,5 @@ index 864cb119..6344462c 100644
      }
  
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch b/BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch
index 7ac5705e..1ac3e5a8 100644
--- a/BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch
+++ b/BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch
@@ -1,4 +1,4 @@
-From 1e3097751b2756f71a22c1c587dd9bf0e4ab3542 Mon Sep 17 00:00:00 2001
+From 0d1036cb0010216d153ec9c40ebb8d95c7a5394c 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 db50f379..b0473509 100644
+index b310ab1e..0f99ea8b 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 db50f379..b0473509 100644
  import gnu.trove.map.TIntObjectMap;
  import gnu.trove.map.TObjectIntMap;
  import gnu.trove.map.hash.TIntObjectHashMap;
-@@ -965,9 +967,12 @@ public enum Protocol
+@@ -994,9 +996,12 @@ public enum Protocol
              {
                  throw new BadPacketException( "Unsupported protocol version" );
              }
@@ -34,5 +34,5 @@ index db50f379..b0473509 100644
      }
  }
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0062-Add-message-for-outdated-clients-that-don-t-support-.patch b/BungeeCord-Patches/0062-Add-message-for-outdated-clients-that-don-t-support-.patch
index 1f1932f0..8176ae7b 100644
--- a/BungeeCord-Patches/0062-Add-message-for-outdated-clients-that-don-t-support-.patch
+++ b/BungeeCord-Patches/0062-Add-message-for-outdated-clients-that-don-t-support-.patch
@@ -1,4 +1,4 @@
-From 1bb298261fbe4055f454f218d6d3e58ce5df02f2 Mon Sep 17 00:00:00 2001
+From a3aa62d9a9c792751bc43c0bd534737f704364b5 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,10 +8,10 @@ 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 6344462c..d58caade 100644
+index 37715ba9..31a7e109 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
-@@ -435,6 +435,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -443,6 +443,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
  
          if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 )
          {
@@ -32,5 +32,5 @@ index 149c742f..8d5075f6 100644
  error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
  error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0063-Replace-reflection-inside-netty-with-ChannelFactory.patch b/BungeeCord-Patches/0063-Replace-reflection-inside-netty-with-ChannelFactory.patch
index 11de8586..27d095cf 100644
--- a/BungeeCord-Patches/0063-Replace-reflection-inside-netty-with-ChannelFactory.patch
+++ b/BungeeCord-Patches/0063-Replace-reflection-inside-netty-with-ChannelFactory.patch
@@ -1,4 +1,4 @@
-From c79ec3626db9d05827e0372405b20c855af7eebe Mon Sep 17 00:00:00 2001
+From 0585538df38f4eb67408cd5d1bd2ef389ae00c40 Mon Sep 17 00:00:00 2001
 From: Janmm14 <gitconfig1@janmm14.de>
 Date: Mon, 21 Jun 2021 23:43:39 +0200
 Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
@@ -32,7 +32,7 @@ index 377df7ec..8f531f85 100644
                  .handler( PipelineUtils.BASE_SERVERSIDE )
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
 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 9e5e3e6a..5fda0b3f 100644
+index 6b1eec24..75040386 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -414,7 +414,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -69,7 +69,7 @@ index 37337429..c3683c30 100644
      }
      // Waterfall End
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index 3b157d79..0cb8f910 100644
+index 75d2bd0e..4a5b2476 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 @@ -5,6 +5,7 @@ import io.github.waterfallmc.waterfall.event.ConnectionInitEvent;
@@ -80,7 +80,7 @@ index 3b157d79..0cb8f910 100644
  import io.netty.channel.ChannelInitializer;
  import io.netty.channel.ChannelOption;
  import io.netty.channel.EventLoopGroup;
-@@ -125,6 +126,12 @@ public class PipelineUtils
+@@ -124,6 +125,12 @@ public class PipelineUtils
  
      private static boolean epoll;
      private static boolean io_uring;
@@ -93,7 +93,7 @@ index 3b157d79..0cb8f910 100644
  
      static
      {
-@@ -155,6 +162,12 @@ public class PipelineUtils
+@@ -154,6 +161,12 @@ public class PipelineUtils
                  }
              }
          }
@@ -106,7 +106,7 @@ index 3b157d79..0cb8f910 100644
      }
  
      public static EventLoopGroup newEventLoopGroup(int threads, ThreadFactory factory)
-@@ -186,6 +199,34 @@ public class PipelineUtils
+@@ -185,6 +198,34 @@ public class PipelineUtils
          return io_uring ? IOUringSocketChannel.class : epoll ? EpollSocketChannel.class : NioSocketChannel.class;
      }
  
@@ -142,5 +142,5 @@ index 3b157d79..0cb8f910 100644
      {
          return io_uring ? IOUringDatagramChannel.class : epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0064-reduce-log-spam-from-clients-registeirng-too-many-ch.patch b/BungeeCord-Patches/0064-reduce-log-spam-from-clients-registeirng-too-many-ch.patch
index c57f7663..2d5a4a4d 100644
--- a/BungeeCord-Patches/0064-reduce-log-spam-from-clients-registeirng-too-many-ch.patch
+++ b/BungeeCord-Patches/0064-reduce-log-spam-from-clients-registeirng-too-many-ch.patch
@@ -1,14 +1,14 @@
-From cac555c6529aa2d35be20c9ea8fbc562a43cb2f1 Mon Sep 17 00:00:00 2001
+From fa300c76e8f2548062ea48933869f1b22c8c5b4f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 21 Apr 2023 15:32:33 +0100
 Subject: [PATCH] reduce log spam from clients registeirng too many channels
 
 
 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 d58caade..f28576f6 100644
+index 31a7e109..185e63ad 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
-@@ -188,7 +188,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -194,7 +194,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public void handle(PluginMessage pluginMessage) throws Exception
      {
@@ -28,5 +28,5 @@ index d58caade..f28576f6 100644
  
      @Override
 -- 
-2.45.1.windows.1
+2.46.1.windows.1
 
diff --git a/BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch b/BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch
index 12da172d..e361f1ba 100644
--- a/BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch
+++ b/BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch
@@ -1,4 +1,4 @@
-From a2eaec00275afdeccd42d641f3e289258f7cee1f Mon Sep 17 00:00:00 2001
+From 23a9f624ede3aac35e60ea3f2011e83b6a430efb Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2023 00:36:38 +0100
 Subject: [PATCH] Prevent proxy commands from breaking the chat chain system
@@ -19,12 +19,12 @@ index 735026d7..55a67abb 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 b0473509..f25d3fab 100644
+index 0f99ea8b..7c258140 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
-@@ -558,6 +558,13 @@ public enum Protocol
-                     map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 ),
-                     map( ProtocolConstants.MINECRAFT_1_20_5, 0x06 )
+@@ -582,6 +582,13 @@ public enum Protocol
+                     map( ProtocolConstants.MINECRAFT_1_20_5, 0x06 ),
+                     map( ProtocolConstants.MINECRAFT_1_21_2, 0x07 )
              );
 +            // Waterfall start
 +            TO_SERVER.registerPacket(
@@ -76,7 +76,7 @@ index 00000000..08ecf2a3
 +    }
 +}
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
-index 887ff29f..d4700090 100644
+index 33c838f9..f259ee91 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
 @@ -108,4 +108,9 @@ public class ClientCommand extends DefinedPacket
@@ -130,5 +130,5 @@ index 88ad9a4c..b8766545 100644
          }
          throw CancelSendSignal.INSTANCE;
 -- 
-2.45.1.windows.1
+2.46.1.windows.1