Updated Upstream (BungeeCord)

Author: nathanosoares

BungeeCord

@@ -1,4 +1,4 @@
-From cf1b3133971d590e1e2ef2a51bc5f1931bc6b5de Mon Sep 17 00:00:00 2001
+From 037d5cb30fa3372177b73a6430f0be5caf154583 Mon Sep 17 00:00:00 2001
 From: Tux <[email protected]>
 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
 

BungeeCord-Patches/0001-POM-Changes.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 <[email protected]>
 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
 

BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.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 <[email protected]>
 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
 

BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.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 <[email protected]>
 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
 

BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.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 <[email protected]>
 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
 

BungeeCord-Patches/0022-Add-dynamic-server-addition-removal-api.patch

@@ -1,15 +1,15 @@
-From 9bc18857dcb1fe2d830cd8e581769f6385f1cc62 Mon Sep 17 00:00:00 2001
+From c076a4b743a3b74328fa5877ccfa8ee9350a472c Mon Sep 17 00:00:00 2001
 From: Ichbinjoe <[email protected]>
 Date: Sat, 16 Jul 2016 20:44:01 -0400
 Subject: [PATCH] Add timeout variant to connect methods
 
 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
 

BungeeCord-Patches/0026-Add-timeout-variant-to-connect-methods.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 <[email protected]>
 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
 

BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.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,22 +123,22 @@ 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;
 +    }
 +    // 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