diff --git a/BungeeCord b/BungeeCord
index 7c7cb3de..e62fc6c2 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 7c7cb3de0fa8e57b312b21d4d7e337df7ac01880
+Subproject commit e62fc6c2916a991e00177c580986d8b1a22fdb41
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 806c058b..8054d067 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From cf1b3133971d590e1e2ef2a51bc5f1931bc6b5de Mon Sep 17 00:00:00 2001
+From 037d5cb30fa3372177b73a6430f0be5caf154583 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
@@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
 - Deploy to papermc mvn repo
 
 diff --git a/api/pom.xml b/api/pom.xml
-index bc3de477..74a835d1 100644
+index 11bdc806..fe3d2bc9 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,48 +4,48 @@
@@ -593,7 +593,7 @@ index 8beec32c..023ce639 100644
          <license>
              <name>BSD-3-Clause</name>
 diff --git a/pom.xml b/pom.xml
-index e5b4af03..044b45de 100644
+index 548700d2..5b9b8c1f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -670,12 +670,12 @@ index e5b4af03..044b45de 100644
  
      <distributionManagement>
 -        <snapshotRepository>
--            <id>sonatype-nexus-snapshots</id>
--            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+-            <id>central-portal-snapshots</id>
+-            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
 -        </snapshotRepository>
          <repository>
--            <id>sonatype-nexus-staging</id>
--            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+-            <id>ossrh-staging-api</id>
+-            <url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
 +            <id>papermc-releases</id>
 +            <url>https://repo.papermc.io/repository/maven-releases/</url>
          </repository>
@@ -987,5 +987,5 @@ index a583c5f6..de36c7fd 100644
      <properties>
          <checkstyle.skip>true</checkstyle.skip>
 -- 
-2.39.5
+2.43.0
 
diff --git 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
index 8ed48c1c..33bb219a 100644
--- 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 e62a9f209ac34fad80b59d6a85294db406f3aca2 Mon Sep 17 00:00:00 2001
+From 79e1509bda65f987fda2ac335bc0665e6c236d6e 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
@@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
 No breaking changes occur due to this patch.
 
 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 ef348679..22af16c7 100644
+index db54342a..7bcb585d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufAllocator;
@@ -30,7 +30,7 @@ index ef348679..22af16c7 100644
 +
 +            // Waterfall start - properties
 +            // Handle properties.
-+            net.md_5.bungee.protocol.Property[] properties = new net.md_5.bungee.protocol.Property[0];
++            net.md_5.bungee.protocol.data.Property[] properties = new net.md_5.bungee.protocol.data.Property[0];
 +
              if ( profile != null && profile.getProperties() != null && profile.getProperties().length > 0 )
              {
@@ -41,13 +41,13 @@ index ef348679..22af16c7 100644
 +            if ( user.getForgeClientHandler().isFmlTokenInHandshake() )
 +            {
 +                // Get the current properties and copy them into a slightly bigger array.
-+                net.md_5.bungee.protocol.Property[] newp = Arrays.copyOf( properties, properties.length + 2 );
++                net.md_5.bungee.protocol.data.Property[] newp = Arrays.copyOf( properties, properties.length + 2 );
 +
 +                // Add a new profile property that specifies that this user is a Forge user.
-+                newp[newp.length - 2] = new net.md_5.bungee.protocol.Property( ForgeConstants.FML_LOGIN_PROFILE, "true", null );
++                newp[newp.length - 2] = new net.md_5.bungee.protocol.data.Property( ForgeConstants.FML_LOGIN_PROFILE, "true", null );
 +
 +                // If we do not perform the replacement, then the IP Forwarding code in Spigot et. al. will try to split on this prematurely.
-+                newp[newp.length - 1] = new net.md_5.bungee.protocol.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replaceAll( "\0", "\1"), "" );
++                newp[newp.length - 1] = new net.md_5.bungee.protocol.data.Property( ForgeConstants.EXTRA_DATA, user.getExtraDataInHandshake().replaceAll( "\0", "\1"), "" );
 +
 +                // All done.
 +                properties = newp;
@@ -69,10 +69,10 @@ index ef348679..22af16c7 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 9d2e05f8..3621ae4e 100644
+index fad6835d..47221881 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -198,9 +198,12 @@ public final class UserConnection implements ProxiedPlayer
+@@ -201,9 +201,12 @@ public final class UserConnection implements ProxiedPlayer
  
          forgeClientHandler = new ForgeClientHandler( this );
  
@@ -103,5 +103,5 @@ index 6dca2048..f5253b89 100644
       * The FML 1.8 handshake token.
       */
 -- 
-2.49.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch b/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
index 4ed8d60d..b6daafd1 100644
--- a/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
+++ b/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
@@ -1,14 +1,14 @@
-From 602900eac3d6806b3ddc68b645c1160ecc4be10c Mon Sep 17 00:00:00 2001
+From 9864d4bb6609e61739d298eb9d00c5fe9f498348 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 17:36:31 -0600
 Subject: [PATCH] Better unit tests for Chat API
 
 
 diff --git a/serializer/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/serializer/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-index 47e84cd6..f330a625 100644
+index 8f95ae49..b7acaf57 100644
 --- a/serializer/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 +++ b/serializer/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-@@ -682,6 +682,26 @@ public class ComponentsTest
+@@ -689,6 +689,26 @@ public class ComponentsTest
          assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
      }
  
@@ -52,5 +52,5 @@ index 995c70f2..dd9f040d 100644
 +    }
  }
 -- 
-2.49.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
index 95d16ae5..f5a1dd45 100644
--- 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 7b52a774a2fc4eafa998b5ea81cd3b23aa1e501a Mon Sep 17 00:00:00 2001
+From 85091a83d9dc2fe5008bb50ef64aaeb0fe7dcd5f 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
@@ -43,10 +43,10 @@ index abcb53bb..0dd0fe31 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 dd49fb1a..545f33dd 100644
+index dea027b0..ee354aeb 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
-@@ -1035,14 +1035,23 @@ public enum Protocol
+@@ -1036,14 +1036,23 @@ public enum Protocol
              return protocol;
          }
  
@@ -72,7 +72,7 @@ index dd49fb1a..545f33dd 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 22af16c7..931cb4fa 100644
+index 7bcb585d..6b91df6b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -246,6 +246,12 @@ public class ServerConnector extends PacketHandler
@@ -106,5 +106,5 @@ index 77b27c6f..26c1e1be 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.39.5
+2.43.0
 
diff --git a/BungeeCord-Patches/0022-Add-dynamic-server-addition-removal-api.patch b/BungeeCord-Patches/0022-Add-dynamic-server-addition-removal-api.patch
index d59b63cc..4b6e8fe5 100644
--- a/BungeeCord-Patches/0022-Add-dynamic-server-addition-removal-api.patch
+++ b/BungeeCord-Patches/0022-Add-dynamic-server-addition-removal-api.patch
@@ -1,4 +1,4 @@
-From 74fa2f256598a8dc5ed044c63ed059d0ddea88d6 Mon Sep 17 00:00:00 2001
+From 82fc1aac142029b332d62a693ea5d585024716d1 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 04:29:25 +0200
 Subject: [PATCH] Add dynamic server addition/removal api.
@@ -157,18 +157,18 @@ index 262b29c8..d7ed3e11 100644
      {
          int index = path.indexOf( SEPARATOR );
 diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
-index 59c104d3..698b420f 100644
+index f479a888..7d114541 100644
 --- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
 +++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
-@@ -83,7 +83,7 @@ public class CommandServer extends Command implements TabExecutor
-     @Override
+@@ -80,7 +80,7 @@ public class CommandServer extends Command implements TabExecutor
      public Iterable<String> onTabComplete(final CommandSender sender, final String[] args)
      {
--        return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServers().values(), new Predicate<ServerInfo>()
-+        return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServersCopy().values(), new Predicate<ServerInfo>() // Waterfall: use #getServersCopy()
-         {
-             private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
- 
+         final String serverFilter = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
+-        return () -> ProxyServer.getInstance().getServers().values().stream()
++        return () -> ProxyServer.getInstance().getServersCopy().values().stream() // Waterfall: use #getServersCopy()
+                 .filter( serverInfo -> serverInfo.getName().toLowerCase( Locale.ROOT ).startsWith( serverFilter ) && serverInfo.canAccess( sender ) )
+                 .map( ServerInfo::getName )
+                 .iterator();
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 index e69da6c5..a8041258 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -311,5 +311,5 @@ index eb651a14..7a4da21f 100644
 +    // Waterfall end
  }
 -- 
-2.49.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0026-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0026-Add-timeout-variant-to-connect-methods.patch
index 72972741..2b49b256 100644
--- a/BungeeCord-Patches/0026-Add-timeout-variant-to-connect-methods.patch
+++ b/BungeeCord-Patches/0026-Add-timeout-variant-to-connect-methods.patch
@@ -1,4 +1,4 @@
-From 9bc18857dcb1fe2d830cd8e581769f6385f1cc62 Mon Sep 17 00:00:00 2001
+From c076a4b743a3b74328fa5877ccfa8ee9350a472c 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Add timeout variant to connect methods
 Also added more connect methods to ProxiedPlayer, in addition to the new method
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
-index 1c0714f4..a6657bf3 100644
+index d4831f7f..7591b98f 100644
 --- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
 +++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
-@@ -129,6 +129,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
+@@ -131,6 +131,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
       */
      void connect(ServerInfo target, Callback<Boolean> callback);
  
@@ -48,7 +48,7 @@ index 1c0714f4..a6657bf3 100644
      /**
       * Connects / transfers this user to the specified connection, gracefully
       * closing the current one. Depending on the implementation, this method
-@@ -142,6 +174,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
+@@ -144,6 +176,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
       */
      void connect(ServerInfo target, Callback<Boolean> callback, ServerConnectEvent.Reason reason);
  
@@ -75,10 +75,10 @@ index 1c0714f4..a6657bf3 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 3621ae4e..a5ab08e3 100644
+index 47221881..1d0553f8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -326,9 +326,20 @@ public final class UserConnection implements ProxiedPlayer
+@@ -329,9 +329,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 3621ae4e..a5ab08e3 100644
          if ( callback != null )
          {
              // Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
-@@ -411,7 +422,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -414,7 +425,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 3621ae4e..a5ab08e3 100644
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
 -- 
-2.49.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch b/BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch
index 45f46714..56c93586 100644
--- a/BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch
+++ b/BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch
@@ -1,4 +1,4 @@
-From d085442a1209e25e7b9b2773b0d8845a21971df7 Mon Sep 17 00:00:00 2001
+From 307a5e9a0c13a6ff3fa3025e6e58732f1318f930 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
@@ -117,7 +117,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 a5ab08e3..e062987f 100644
+index 1d0553f8..617edba6 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 @@
@@ -130,7 +130,7 @@ index a5ab08e3..e062987f 100644
  import io.netty.bootstrap.Bootstrap;
  import io.netty.channel.ChannelFuture;
  import io.netty.channel.ChannelFutureListener;
-@@ -139,6 +141,10 @@ public final class UserConnection implements ProxiedPlayer
+@@ -142,6 +144,10 @@ public final class UserConnection implements ProxiedPlayer
      private final Scoreboard serverSentScoreboard = new Scoreboard();
      @Getter
      private final Collection<UUID> sentBossBars = new HashSet<>();
@@ -217,5 +217,5 @@ index d15044f4..087cb4b0 100644
      /**
       * Sends the server mod list to the client, or stores it for sending later.
 -- 
-2.39.5
+2.43.0
 
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 07b08378..39856cb7 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,6 +1,6 @@
-From b2315842ff1b4b216d6cb74426547ee9f6a81c96 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Mon, 14 Jan 2019 03:35:21 +0000
+From 25874cc79b62282c450c80a14f6a819922f9d846 Mon Sep 17 00:00:00 2001
+From: Nathan Soares <eu@nathan.com.br>
+Date: Sun, 3 Aug 2025 10:44:33 -0300
 Subject: [PATCH] Provide an option to disable entity metadata rewriting
 
 The work here is derived from the research and guidance of
@@ -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 6603ce9a..7c6a2e65 100644
+index 67c63260..5b49c447 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -276,7 +276,8 @@ public class ServerConnector extends PacketHandler
@@ -123,14 +123,14 @@ index 6603ce9a..7c6a2e65 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 e062987f..8ade4cbb 100644
+index 617edba6..430a9299 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -880,4 +880,10 @@ public final class UserConnection implements ProxiedPlayer
+@@ -895,4 +895,10 @@ public final class UserConnection implements ProxiedPlayer
  
-         unsafe.sendPacket( new ShowDialog( Either.right( dialog ) ) );
+         unsafe.sendPacket( new ServerLinks( links ) );
      }
-+
++    
 +    // Waterfall start
 +    public boolean isDisableEntityMetadataRewrite() {
 +        return entityRewrite == net.md_5.bungee.entitymap.EntityMap_Dummy.INSTANCE;
@@ -138,7 +138,7 @@ index e062987f..8ade4cbb 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 2984b988..0227c0de 100644
+index a6d49bb7..526d19b1 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
 @@ -758,6 +758,7 @@ public class DownstreamBridge extends PacketHandler
@@ -190,11 +190,10 @@ index 26c1e1be..01a60130 100644
  
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_Dummy.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_Dummy.java
 new file mode 100644
-index 00000000..cb81d1dd
+index 00000000..0469e7c8
 --- /dev/null
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_Dummy.java
-@@ -0,0 +1,30 @@
-+
+@@ -0,0 +1,29 @@
 +package net.md_5.bungee.entitymap;
 +
 +import io.netty.buffer.ByteBuf;
@@ -226,5 +225,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.49.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch b/BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
index fd0a7145..e7e34e3f 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 3ad6bd3829e9b824be688526c3efbdc970316942 Mon Sep 17 00:00:00 2001
+From bf537f9caf3ce8c08c43d887b289b9a1dbe8c2d4 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
@@ -59,10 +59,10 @@ index 6c0ef4df..076ddd70 100644
 +    // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index 1ccca2f0..0effaf7b 100644
+index 122197e1..afad2ce2 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -80,6 +80,9 @@ public abstract class DefinedPacket
+@@ -85,6 +85,9 @@ public abstract class DefinedPacket
          }
      }
  
@@ -72,7 +72,7 @@ index 1ccca2f0..0effaf7b 100644
      public static void writeString(String s, ByteBuf buf)
      {
          writeString( s, buf, Short.MAX_VALUE );
-@@ -282,13 +285,18 @@ public abstract class DefinedPacket
+@@ -286,13 +289,18 @@ public abstract class DefinedPacket
          byte in;
          while ( true )
          {
@@ -172,7 +172,7 @@ 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 31cdbe48..b8f1010e 100644
+index 5116128f..32199eec 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
 @@ -24,6 +24,8 @@ import javax.crypto.SecretKey;
@@ -221,5 +221,5 @@ index ac99d02c..0c1ecfb8 100644
  
              // Waterfall start
 -- 
-2.39.5
+2.43.0
 
diff --git a/BungeeCord-Patches/0050-Allow-to-disable-tablist-rewrite.patch b/BungeeCord-Patches/0050-Allow-to-disable-tablist-rewrite.patch
index f822f5bd..0dfeb866 100644
--- a/BungeeCord-Patches/0050-Allow-to-disable-tablist-rewrite.patch
+++ b/BungeeCord-Patches/0050-Allow-to-disable-tablist-rewrite.patch
@@ -1,6 +1,6 @@
-From 92bfa6fbb44745782b364570b5b229b677b24b91 Mon Sep 17 00:00:00 2001
-From: xDark <aleshkailyashevich@gmail.com>
-Date: Fri, 31 May 2019 08:11:31 +0300
+From bec1edc9f5a5a79887cd69c01b6683723f75bcc4 Mon Sep 17 00:00:00 2001
+From: Nathan Soares <eu@nathan.com.br>
+Date: Sun, 3 Aug 2025 10:52:42 -0300
 Subject: [PATCH] Allow to disable tablist rewrite
 
 
@@ -50,7 +50,7 @@ index e860214f..b88e3c8a 100644
 +    }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index b4a88391..e8fc16bb 100644
+index 12afcebd..82d20253 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
 @@ -172,8 +172,14 @@ public class DownstreamBridge extends PacketHandler
@@ -71,5 +71,5 @@ index b4a88391..e8fc16bb 100644
  
      @Override
 -- 
-2.49.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0054-Additional-DoS-mitigations.patch b/BungeeCord-Patches/0054-Additional-DoS-mitigations.patch
index 775fab82..9e26db66 100644
--- a/BungeeCord-Patches/0054-Additional-DoS-mitigations.patch
+++ b/BungeeCord-Patches/0054-Additional-DoS-mitigations.patch
@@ -1,4 +1,4 @@
-From fefdea2be192142e61f626fc652155c280cf98ce Mon Sep 17 00:00:00 2001
+From 84a1802533df0e1aa51e3d8b131d21c5ff1777e1 Mon Sep 17 00:00:00 2001
 From: "Five (Xer)" <admin@fivepb.me>
 Date: Sat, 30 Jan 2021 18:04:14 +0100
 Subject: [PATCH] Additional DoS mitigations
@@ -8,10 +8,10 @@ Courtesy of Tux and the Velocity Contributors. See:
 https://github.com/VelocityPowered/Velocity/commit/5ceac16a821ea35572ff11412ace8929fd06e278
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index 0effaf7b..f11e9f37 100644
+index afad2ce2..0480c8f1 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -124,6 +124,7 @@ public abstract class DefinedPacket
+@@ -129,6 +129,7 @@ public abstract class DefinedPacket
          int len = readVarInt( buf );
          if ( len > maxLen * 3 )
          {
@@ -19,7 +19,7 @@ index 0effaf7b..f11e9f37 100644
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
          }
  
-@@ -132,6 +133,7 @@ public abstract class DefinedPacket
+@@ -136,6 +137,7 @@ public abstract class DefinedPacket
  
          if ( s.length() > maxLen )
          {
@@ -27,7 +27,7 @@ index 0effaf7b..f11e9f37 100644
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
          }
  
-@@ -634,4 +636,21 @@ public abstract class DefinedPacket
+@@ -638,4 +640,21 @@ public abstract class DefinedPacket
  
      @Override
      public abstract String toString();
@@ -79,7 +79,7 @@ index 9136ac7c..15832a8c 100644
                      throw new BadPacketException( "Packet " + protocol + ":" + prot.getDirection() + "/" + packetId + " (" + packet.getClass().getSimpleName() + ") larger than expected, extra bytes: " + in.readableBytes() );
                  }
              } else
-@@ -73,6 +79,11 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
+@@ -73,6 +79,25 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
              out.add( new PacketWrapper( packet, slice, protocol ) );
              slice = null;
          } catch (BadPacketException | IndexOutOfBoundsException e) {
@@ -88,18 +88,6 @@ index 9136ac7c..15832a8c 100644
 +                throw e;
 +            }
 +            // Waterfall end
-             final String packetTypeStr;
-             if (packetTypeInfo instanceof Integer) {
-                 packetTypeStr = "id " + Integer.toHexString((Integer) packetTypeInfo);
-@@ -82,6 +93,21 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
-                 packetTypeStr = "unknown";
-             }
-             throw new FastDecoderException("Error decoding packet " + packetTypeStr + " with contents:\n" + ByteBufUtil.prettyHexDump(slice), e); // Waterfall
-+            // Waterfall start
-+        } catch (Exception e) {
-+            if (!DEBUG) {
-+                throw e;
-+            }
 +            final String packetTypeStr;
 +            if (packetTypeInfo instanceof Integer) {
 +                packetTypeStr = "id " + Integer.toHexString((Integer) packetTypeInfo);
@@ -109,6 +97,18 @@ index 9136ac7c..15832a8c 100644
 +                packetTypeStr = "unknown";
 +            }
 +            throw new FastDecoderException("Error decoding packet " + packetTypeStr + " with contents:\n" + ByteBufUtil.prettyHexDump(slice), e); // Waterfall
++            // Waterfall start
++        } catch (Exception e) {
++            if (!DEBUG) {
++                throw e;
++            }
+             final String packetTypeStr;
+             if (packetTypeInfo instanceof Integer) {
+                 packetTypeStr = "id " + Integer.toHexString((Integer) packetTypeInfo);
+@@ -82,6 +107,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
+                 packetTypeStr = "unknown";
+             }
+             throw new FastDecoderException("Error decoding packet " + packetTypeStr + " with contents:\n" + ByteBufUtil.prettyHexDump(slice), e); // Waterfall
 +            // Waterfall end
          } finally
          {
@@ -189,7 +189,7 @@ index 1b911699..8244154d 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 e62a3a03..9789215c 100644
+index d9cadc25..5d32ede3 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
 @@ -71,4 +71,13 @@ public class LoginRequest extends DefinedPacket
@@ -234,7 +234,7 @@ index 5f24d425..3163a771 100644
 +    // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/StatusRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/StatusRequest.java
-index 738f0c92..ec33d337 100644
+index 738f0c92..986e0e32 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/StatusRequest.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/StatusRequest.java
 @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
@@ -257,5 +257,5 @@ index 738f0c92..ec33d337 100644
 +    // Waterfall end
  }
 -- 
-2.39.5
+2.43.0
 
diff --git a/BungeeCord-Patches/0057-ServerConnectRequest-sendFeedback.patch b/BungeeCord-Patches/0057-ServerConnectRequest-sendFeedback.patch
index 2fcc5cf1..9e53e281 100644
--- a/BungeeCord-Patches/0057-ServerConnectRequest-sendFeedback.patch
+++ b/BungeeCord-Patches/0057-ServerConnectRequest-sendFeedback.patch
@@ -1,4 +1,4 @@
-From df5451d8a19b659b5f106d3f8d63f5a2807b2ee9 Mon Sep 17 00:00:00 2001
+From 300c14737b158fb3f87374a666de3d417c4480cc 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 8ade4cbb..9008dac5 100644
+index 430a9299..9d00eaf7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -339,12 +339,16 @@ public final class UserConnection implements ProxiedPlayer
+@@ -342,12 +342,16 @@ public final class UserConnection implements ProxiedPlayer
          connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
      }
  
@@ -53,7 +53,7 @@ index 8ade4cbb..9008dac5 100644
          builder.connectTimeout(timeout); // Waterfall
          if ( callback != null )
          {
-@@ -393,7 +397,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -396,7 +400,7 @@ public final class UserConnection implements ProxiedPlayer
                  callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
              }
  
@@ -62,7 +62,7 @@ index 8ade4cbb..9008dac5 100644
              return;
          }
          if ( pendingConnects.contains( target ) )
-@@ -403,7 +407,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -406,7 +410,7 @@ public final class UserConnection implements ProxiedPlayer
                  callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
              }
  
@@ -71,7 +71,7 @@ index 8ade4cbb..9008dac5 100644
              return;
          }
  
-@@ -427,14 +431,14 @@ public final class UserConnection implements ProxiedPlayer
+@@ -430,14 +434,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 8ade4cbb..9008dac5 100644
                  } else
                  {
 -- 
-2.49.0
+2.43.0
 
diff --git a/BungeeCord-Patches/0058-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch b/BungeeCord-Patches/0058-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch
index a2073aaa..f7a39c5e 100644
--- a/BungeeCord-Patches/0058-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch
+++ b/BungeeCord-Patches/0058-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch
@@ -1,4 +1,4 @@
-From 688375e662d5350af9196417d88d6428c06c2192 Mon Sep 17 00:00:00 2001
+From 34f70b1c217b348e81f32ccdaef9342904a55b40 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 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 9008dac5..0370b3e5 100644
+index 9d00eaf7..f81a9441 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -462,7 +462,8 @@ public final class UserConnection implements ProxiedPlayer
+@@ -465,7 +465,8 @@ public final class UserConnection implements ProxiedPlayer
  
      private String connectionFailMessage(Throwable cause)
      {
@@ -27,5 +27,5 @@ index 9008dac5..0370b3e5 100644
  
      @Override
 -- 
-2.49.0
+2.43.0
 
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 8d549f89..1adfc604 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 11fdb7305c264c8bb5a8b2f9dfaa1533c83e80dc Mon Sep 17 00:00:00 2001
+From c2b3d0963a5066e0e308981b27efd6192aa3ac2d 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,10 +6,10 @@ 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 545f33dd..f3a3c713 100644
+index ee354aeb..7c9ecd8f 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
-@@ -1130,9 +1130,12 @@ public enum Protocol
+@@ -1131,9 +1131,12 @@ public enum Protocol
              {
                  throw new BadPacketException( "Unsupported protocol version" );
              }
@@ -25,5 +25,5 @@ index 545f33dd..f3a3c713 100644
      }
  }
 -- 
-2.39.5
+2.43.0
 
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 3ab70112..d7f0e8e2 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 6317bb4ec56b10816f4ded1f85b09ef1a88c3fd6 Mon Sep 17 00:00:00 2001
+From 45cf69196dc8790a91b1249ed0968eac9bd9cce0 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,10 +32,10 @@ index 0d24f1eb..0ce7b343 100644
                  .handler( ProxyServer.getInstance().unsafe().getServerInfoChannelInitializer().getChannelInitializer() )
                  .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 0370b3e5..d80d6b07 100644
+index f81a9441..d9a57ad5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -447,7 +447,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -450,7 +450,7 @@ public final class UserConnection implements ProxiedPlayer
              }
          };
          Bootstrap b = new Bootstrap()
@@ -143,5 +143,5 @@ index e79500f3..cb216a8c 100644
      {
          return io_uring ? IoUringDatagramChannel.class : epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
 -- 
-2.49.0
+2.43.0
 
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 4ed4889b..e28a9fbf 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 a39cfd90ee4d1ef08c9afc90d620323db9392f9e Mon Sep 17 00:00:00 2001
+From 8e6364d0519716ef5eb6a5252c3f40ff16ba9118 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,10 +19,10 @@ index 46f568b3..48048202 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 f3a3c713..b4d980b5 100644
+index 7c9ecd8f..ea84ad15 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
-@@ -651,6 +651,13 @@ public enum Protocol
+@@ -652,6 +652,13 @@ public enum Protocol
                      map( ProtocolConstants.MINECRAFT_1_21_2, 0x07 ),
                      map( ProtocolConstants.MINECRAFT_1_21_6, 0x08 )
              );
@@ -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 f86fcd08..40df53fe 100644
+index 31104505..48b20a7e 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
 @@ -119,4 +119,9 @@ public class ClientCommand extends DefinedPacket
@@ -90,7 +90,7 @@ index f86fcd08..40df53fe 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 e416f753..e905d237 100644
+index bf7ae09f..707e1ff2 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
 @@ -200,16 +200,22 @@ public class UpstreamBridge extends PacketHandler
@@ -133,5 +133,5 @@ index e416f753..e905d237 100644
          throw CancelSendSignal.INSTANCE;
      }
 -- 
-2.39.5
+2.43.0