Updated Upstream (BungeeCord)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
d5aa9f3d Re-enable enforcement of dependency convergence
bdafd506 #3951: Bump the maven-resolver group with 3 updates
66b377de Update dependabot.yml
15bb31da #3945: Bump org.yaml:snakeyaml from 2.2 to 2.6
3a815646 #3940: Bump com.mysql:mysql-connector-j from 8.4.0 to 9.6.0
9be97295 #3950: Bump org.jline:jline from 3.30.6 to 3.30.7
fa04f2dc #3948: Bump org.apache.maven.plugins:maven-shade-plugin from 3.6.1 to 3.6.2
0b98b211 Update dependabot.yml
604825af #3949: Bump org.junit.jupiter:junit-jupiter from 5.10.2 to 5.14.3
6a89ca81 Update dependabot.yml
98ffc1e2 Bump com.puppycrawl.tools:checkstyle from 8.45.1 to 9.3
4c3c17bb #3904: Bump com.google.guava:guava from 33.4.8-jre to 33.5.0-jre
d70270ca #3901: Bump org.projectlombok:lombok from 1.18.38 to 1.18.42
3abeb47b #3905: Bump it.unimi.dsi:fastutil-core from 8.5.15 to 8.5.18
01604830 #3900: Bump org.jline:jline from 3.30.4 to 3.30.6
f9f257de #3894: Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.6.2
0bca3791 #3896: Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.4 to 3.2.8
c2e2bb5e #3898: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.12.0
e7605faa #3912: Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.5.0
2d81eb15 #3902: Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.3 to 3.6.1
2f59683b #3917: Bump org.apache.maven.plugins:maven-source-plugin from 3.3.1 to 3.4.0
20dc45d1 #3928: Bump org.sonatype.central:central-publishing-maven-plugin
4f81e63a #3936: Bump org.codehaus.mojo:animal-sniffer-maven-plugin from 1.24 to 1.27
ad779bcb #3941: Bump org.apache.maven.plugins:maven-compiler-plugin
18df7b22 #3926: Add PlayerConfigurationEvent
af229047 Fix formatting in ObjectComponentSerializer
554f1aad #3891: Bump actions/setup-java from 4 to 5
5b12ebdf #3942: Bump io.netty:netty-bom from 4.2.7.Final to 4.2.10.Final
5894fb2a #3923: Bump org.ow2.asm:asm-commons from 9.8 to 9.9.1
8a6d1fe0 #3914: Bump actions/checkout from 4 to 6
803d3897 Minecraft 26.1-snapshot-11 support
1f64bb8e #3943: Send brand and settings directly after config transition
9149e8ac Minecraft 26.1-snapshot-10 support
a73268ab Minecraft 26.1-snapshot-9 support
7d6516ee #3925: Add command name to stack trace
cf5bb43a #3938, #3939: Fix TabExecutor when command has the same name as Brigadier command
1a3f96d9 #3935: Update year to 2026
7b5751f4 #3932: Fix ArrayIndexOutOfBoundsException with MAX_PACKET_ID
adcda46d #3933, #3934: Missing "." in command /bungee
62f0464d Minecraft 26.1-snapshot-7 support
53df9987 #3930: Minecraft 26.1-snapshot-3 support
36e61543 #3922: Minecraft 26.1-snapshot-1 support
0bc4587b Minecraft 1.21.11 support
83ba0ec4 Minecraft 1.21.11-rc2 support
3929ac42 Minecraft 1.21.11-pre2 support
81c38488 #3913: Remove experimental annotations on PendingConnection methods
5916f083 #3909: Send bungeecord registered plugin channels immediately  in config phase
fd4d0443 Minecraft 25w45a support
c1ec7c24 Minecraft 25w44a support
5070e812 Update Jenkins URLs
df85f511 #3885: Remove manual player removal from tab list
45f3ba0e #3890: Bump Netty to 4.2.7-Final
296b31bd Minecraft 1.21.9 support

Author: electronicboy

BungeeCord

@@ -1,4 +1,4 @@
-From 4bf741b711326cad7051ac737d7ba112f99c205d Mon Sep 17 00:00:00 2001
+From 8ad3338a21818d6de4340cd65cdda86674500557 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 d45fb235..86da49a8 100644
+index 4924e04e..481afaaf 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,48 +4,48 @@
@@ -75,7 +75,7 @@ index d45fb235..86da49a8 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 509fddd5..67e8bad5 100644
+index 9700de8f..1e076b4b 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,40 +4,41 @@
@@ -154,7 +154,7 @@ index 6be22739..a4516ed9 100644
              return;
          }
 diff --git a/chat/pom.xml b/chat/pom.xml
-index a149e83c..b5180fb8 100644
+index ed80a085..79a94905 100644
 --- a/chat/pom.xml
 +++ b/chat/pom.xml
 @@ -4,19 +4,19 @@
@@ -184,7 +184,7 @@ index a149e83c..b5180fb8 100644
      <dependencies>
          <dependency>
 diff --git a/config/pom.xml b/config/pom.xml
-index 24150823..0832a8cb 100644
+index 16a66d12..a5becbcb 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
 @@ -4,19 +4,19 @@
@@ -283,7 +283,7 @@ index 463149f2..1fdbea07 100644
 +    <description>Generic java event dispatching API intended for use with Waterfall.</description>
  </project>
 diff --git a/log/pom.xml b/log/pom.xml
-index 3efba3c6..3d936b77 100644
+index d15110c1..83f8ee8d 100644
 --- a/log/pom.xml
 +++ b/log/pom.xml
 @@ -4,19 +4,19 @@
@@ -595,7 +595,7 @@ index d7ff234f..ecfaeb7e 100644
          <license>
              <name>BSD-3-Clause</name>
 diff --git a/pom.xml b/pom.xml
-index 6db2b04b..8dbe11bb 100644
+index 2bb39c8a..e60e9ee1 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -667,7 +667,7 @@ index 6db2b04b..8dbe11bb 100644
      </issueManagement>
 -    <ciManagement>
 -        <system>jenkins</system>
--        <url>http://ci.md-5.net/job/BungeeCord</url>
+-        <url>https://hub.spigotmc.org/jenkins/job/BungeeCord/</url>
 -    </ciManagement>
 
      <distributionManagement>
@@ -688,15 +688,6 @@ index 6db2b04b..8dbe11bb 100644
      </distributionManagement>
 
      <properties>
-@@ -125,7 +136,7 @@
-                 <plugin>
-                     <groupId>org.apache.maven.plugins</groupId>
-                     <artifactId>maven-javadoc-plugin</artifactId>
--                    <version>3.6.3</version>
-+                    <version>3.11.2</version>
-                 </plugin>
-             </plugins>
-         </pluginManagement>
 @@ -146,12 +157,21 @@
                      </execution>
                  </executions>
@@ -705,11 +696,11 @@ index 6db2b04b..8dbe11bb 100644
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
-                 <version>3.13.0</version>
+                 <version>3.15.0</version>
              </plugin>
              <plugin>
 +                <artifactId>maven-javadoc-plugin</artifactId>
-+                <version>3.11.2</version>
++                <version>3.12.0</version>
 +                <configuration>
 +                    <doclint>none</doclint>
 +                </configuration>
@@ -727,7 +718,7 @@ index 6db2b04b..8dbe11bb 100644
              <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-@@ -297,6 +318,15 @@
+@@ -295,6 +316,15 @@
                                  </goals>
                              </execution>
                          </executions>
@@ -744,7 +735,7 @@ index 6db2b04b..8dbe11bb 100644
                      <plugin>
                          <groupId>org.projectlombok</groupId>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 31f3bb52..d98dc06b 100644
+index c8aa2932..02736b2a 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
 @@ -4,19 +4,19 @@
@@ -793,7 +784,7 @@ index 31f3bb52..d98dc06b 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 7ebe35f8..f1fadd9d 100644
+index bc363b07..5e583a77 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -913,7 +904,7 @@ index 98c88cad..c57c6b13 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/serializer/pom.xml b/serializer/pom.xml
-index d22931c0..c5cb6c2d 100644
+index b082b3e6..2159b626 100644
 --- a/serializer/pom.xml
 +++ b/serializer/pom.xml
 @@ -4,19 +4,19 @@
@@ -989,5 +980,5 @@ index a062a210..2a74a343 100644
      <properties>
          <checkstyle.skip>true</checkstyle.skip>
 -- 
-2.51.0
+2.53.0
 

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From f9aff1b2695e8b7fd0d278c4c1dfe741a4234911 Mon Sep 17 00:00:00 2001
+From 31f1ac7f4d65c9edf1175a596055f51564a1895b Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:28:45 -0700
 Subject: [PATCH] Rename references from BungeeCord to Waterfall
@@ -40,15 +40,15 @@ index 23f22da8..3a1f7174 100644
 
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index cec7fadb..4cc58a5d 100644
+index 6fbfc9d4..6615ad36 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 @@ -56,7 +56,7 @@ public class BungeeCordLauncher
              if ( buildDate.before( deadline.getTime() ) )
              {
                  System.err.println( "*** Warning, this build is outdated ***" );
--                System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" );
-+                System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
+-                System.err.println( "*** Please download a new build from https://www.spigotmc.org/go/bungeecord-dl ***" );
++                System.err.println( "*** Please download a new build from https://papermc.io/downloads ***" );
                  System.err.println( "*** You will get NO support regarding this build ***" );
                  System.err.println( "*** Server will start in 10 seconds ***" );
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
@@ -62,14 +62,14 @@ index cec7fadb..4cc58a5d 100644
 
          if ( !options.has( "noconsole" ) )
 diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
-index b0798791..b26035cf 100644
+index 13de9597..b26035cf 100644
 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
 +++ b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
 @@ -16,6 +16,6 @@ public class CommandBungee extends Command
      @Override
      public void execute(CommandSender sender, String[] args)
      {
--        sender.sendMessage( ChatColor.BLUE + "This server is running BungeeCord version " + ProxyServer.getInstance().getVersion() + " by md_5" );
+-        sender.sendMessage( ChatColor.BLUE + "This server is running BungeeCord version " + ProxyServer.getInstance().getVersion() + " by md_5." );
 +        sender.sendMessage( ChatColor.BLUE + "This server is running Waterfall version " + ProxyServer.getInstance().getVersion() + " by md_5" );
      }
  }
@@ -101,5 +101,5 @@ index 65d782f7..39809d60 100644
              SocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.51.0
+2.53.0
 

BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch

@@ -1,19 +1,19 @@
-From e8b830735afa54b82ac3ebbc9a64601a4dbfb360 Mon Sep 17 00:00:00 2001
+From b08cc79a70f3d9e3c13d88d489ca86a9c3ddf52a 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
 
 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 064639f3..6a6661a5 100644
+index 8f5f34ae..6a6661a5 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
 @@ -19,11 +19,19 @@ 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" );
+-            URL website = new URL( "https://hub.spigotmc.org/jenkins/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
 +            final String url = String.format(
 +                "https://api.papermc.io/v2/projects/%1$s/versions/%2$s/builds/%3$s/downloads/%4$s-%2$s-%3$s.jar",
 +                "waterfall",
@@ -31,5 +31,5 @@ index 064639f3..6a6661a5 100644
              Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
              ProxyServer.getInstance().getLogger().info( "Download complete" );
 -- 
-2.47.0
+2.53.0
 

BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch

@@ -1,14 +1,14 @@
-From 5a6ae48d29860d4c304161b392867134cbf5b978 Mon Sep 17 00:00:00 2001
+From f509d7ff2c8eb5ae14763074719276c7193a1797 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 17294c18..d1132813 100644
+index 220345fc..e922b912 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
-@@ -132,6 +132,16 @@ public class ProtocolConstants
+@@ -136,6 +136,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 
@@ -26,5 +26,5 @@ index 17294c18..d1132813 100644
      {
 
 -- 
-2.51.0
+2.53.0
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,4 +1,4 @@
-From f06187bcb2c621da8ca40e94412ced60bc37290a Mon Sep 17 00:00:00 2001
+From d6fb13fbfbebe46ceffa295d3992ec6c7accca1c Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Don't access a ByteBuf's underlying array
@@ -45,10 +45,10 @@ index 1a7d8512..ad1704dd 100644
       * Allow this packet to be sent as an "extended" packet.
       */
 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 d47f5ef9..ef348679 100644
+index 96b86e5e..b77d21ad 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -287,7 +287,7 @@ public class ServerConnector extends PacketHandler
+@@ -291,7 +291,7 @@ public class ServerConnector extends PacketHandler
 
                  ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
                  DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@@ -58,10 +58,10 @@ index d47f5ef9..ef348679 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 aa5b5bc6..e6993044 100644
+index 9f87d606..6cbd6088 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
-@@ -329,7 +329,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -339,7 +339,7 @@ public class DownstreamBridge extends PacketHandler
 
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@@ -84,5 +84,5 @@ index 0a916c04..cfbab43a 100644
      private static void setChannelInitializerHolders()
      {
 -- 
-2.49.0
+2.53.0
 

BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch

@@ -1,4 +1,4 @@
-From 5c480fc0e29678f0bcf75b85eec6230e70ebe448 Mon Sep 17 00:00:00 2001
+From 0d7d283ad0671e13883debc69e18bb5505c19bbb Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 19 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Micro-optimizations
@@ -8,18 +8,18 @@ Subject: [PATCH] Micro-optimizations
 - Don't create a data input stream for every plugin message we get from servers
 
 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 e6993044..bf41ec23 100644
+index 6cbd6088..91e2bca1 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
-@@ -311,7 +311,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -321,7 +321,6 @@ public class DownstreamBridge extends PacketHandler
      @SuppressWarnings("checkstyle:avoidnestedblocks")
      public void handle(PluginMessage pluginMessage) throws Exception
      {
 -        DataInput in = pluginMessage.getStream();
          PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
 
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -338,6 +337,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -348,6 +347,7 @@ public class DownstreamBridge extends PacketHandler
 
          if ( pluginMessage.getTag().equals( PluginMessage.BUNGEE_CHANNEL_LEGACY ) )
          {
@@ -28,5 +28,5 @@ index e6993044..bf41ec23 100644
              String subChannel = in.readUTF();
 
 -- 
-2.49.0
+2.53.0
 

BungeeCord-Patches/0015-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From bd42f3205d402ad06118daefc04ff6174a0ae1e6 Mon Sep 17 00:00:00 2001
+From f03b3ad3c625250f9a7c5c2e18b41e7202522b77 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 690e1447..53443ddc 100644
+index 85634e11..f7b0d6a7 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
-@@ -1063,14 +1063,23 @@ public enum Protocol
+@@ -1097,14 +1097,23 @@ public enum Protocol
              return protocol;
          }
 
@@ -72,7 +72,7 @@ index 690e1447..53443ddc 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 6ed9e8b3..509f07c3 100644
+index 5d5c027c..102ccb5c 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
@@ -87,7 +87,7 @@ index 6ed9e8b3..509f07c3 100644
 +
          bungee.getPluginManager().callEvent( event );
 
-         ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
+         // Already sent after config start
 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 77b27c6f..26c1e1be 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -106,5 +106,5 @@ index 77b27c6f..26c1e1be 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.51.0
+2.53.0