Updated Upstream (BungeeCord)

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From f2af2b8bab3ef918c1fc4664c5f921a77351770c Mon Sep 17 00:00:00 2001
+From cf1b3133971d590e1e2ef2a51bc5f1931bc6b5de 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
@@ -75,7 +75,7 @@ index bc3de477..74a835d1 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index b54ca5bf..061f7765 100644
+index 5a8b37b0..3d5f497f 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,39 +4,40 @@
@@ -138,7 +138,7 @@ index b54ca5bf..061f7765 100644
 +                            <Main-Class>net.md_5.bungee.Bootstrap</Main-Class>
                              <Implementation-Version>${describe}</Implementation-Version>
                              <Specification-Version>${maven.build.timestamp}</Specification-Version>
-                         </manifestEntries>
+                             <Enable-Native-Access>ALL-UNNAMED</Enable-Native-Access>
 diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
 index 6be22739..a4516ed9 100644
 --- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
@@ -593,7 +593,7 @@ index 8beec32c..023ce639 100644
          <license>
              <name>BSD-3-Clause</name>
 diff --git a/pom.xml b/pom.xml
-index 6f938954..8c35ed93 100644
+index e5b4af03..044b45de 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -987,5 +987,5 @@ index a583c5f6..de36c7fd 100644
      <properties>
          <checkstyle.skip>true</checkstyle.skip>
 -- 
-2.49.0
+2.39.5
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,14 +1,14 @@
-From 03e73e997dc06271e1afffa8b989125b275ee45f Mon Sep 17 00:00:00 2001
+From 10f8e7b785855c7d8263813519adca874d8f4a85 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 4e40c699..1c1a09bc 100644
+index eae98554..f8be48b9 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
-@@ -129,6 +129,16 @@ public class ProtocolConstants
+@@ -131,6 +131,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 
@@ -26,5 +26,5 @@ index 4e40c699..1c1a09bc 100644
      {
 
 -- 
-2.50.0
+2.39.5
 

BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch

@@ -1,4 +1,4 @@
-From 955f3fb382d507d2e5113d8da1a38fe496f6ca77 Mon Sep 17 00:00:00 2001
+From 7b52a774a2fc4eafa998b5ea81cd3b23aa1e501a 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 6c4e6735..d6c76a5b 100644
+index dd49fb1a..545f33dd 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
-@@ -993,14 +993,23 @@ public enum Protocol
+@@ -1035,14 +1035,23 @@ public enum Protocol
              return protocol;
          }
 
@@ -106,5 +106,5 @@ index 77b27c6f..26c1e1be 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.49.0
+2.39.5
 

BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch

@@ -1,14 +1,14 @@
-From 786d670574b0fa2264e313cb849362d425b9b554 Mon Sep 17 00:00:00 2001
+From d085442a1209e25e7b9b2773b0d8845a21971df7 Mon Sep 17 00:00:00 2001
 From: Aaron Hill <aa1ronham@gmail.com>
 Date: Thu, 15 Sep 2016 22:38:37 +0200
 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
-index 86088656..aaf70d03 100644
+index 93e3aaed..46f568b3 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
-@@ -303,4 +303,14 @@ public abstract class AbstractPacketHandler
+@@ -298,4 +298,14 @@ public abstract class AbstractPacketHandler
      public void handle(BundleDelimiter bundleDelimiter) throws Exception
      {
      }
@@ -142,7 +142,7 @@ index a5ab08e3..e062987f 100644
      @Setter
      private String lastCommandTabbed;
 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 f794c0b2..2984b988 100644
+index 6b611fc3..a6d49bb7 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
 @@ -754,6 +754,32 @@ public class DownstreamBridge extends PacketHandler
@@ -217,5 +217,5 @@ index d15044f4..087cb4b0 100644
      /**
       * Sends the server mod list to the client, or stores it for sending later.
 -- 
-2.49.0
+2.39.5
 

BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch

@@ -1,25 +1,24 @@
-From 359e00558c32f0c6eae1e97955e6951c82f558c1 Mon Sep 17 00:00:00 2001
+From dd3e4f64b4c3ce1dc7b0f4e67f3c37c402b113a2 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
  console
 
 
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 061f7765..14a154aa 100644
+index 3d5f497f..45405835 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
-@@ -49,6 +49,9 @@
-                             <Main-Class>net.md_5.bungee.Bootstrap</Main-Class>
+@@ -50,6 +50,8 @@
                              <Implementation-Version>${describe}</Implementation-Version>
                              <Specification-Version>${maven.build.timestamp}</Specification-Version>
-+
+                             <Enable-Native-Access>ALL-UNNAMED</Enable-Native-Access>
 +                            <!-- Log4j includes custom classes for Java 9+ (#293) -->
 +                            <Multi-Release>true</Multi-Release>
                          </manifestEntries>
                      </archive>
                  </configuration>
-@@ -76,7 +79,17 @@
+@@ -77,7 +79,17 @@
                              </excludes>
                          </filter>
                      </filters>
@@ -233,7 +232,7 @@ index 00000000..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 8c35ed93..70bdee0c 100644
+index 044b45de..b51580d5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -52,13 +52,14 @@
@@ -634,5 +633,5 @@ index 6788fbe7..00000000
 -    }
 -}
 -- 
-2.49.0
+2.39.5
 

BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch

@@ -1,4 +1,4 @@
-From bcf08b07a7659d42df94a4160ee76b0af80e93dc Mon Sep 17 00:00:00 2001
+From 3ad6bd3829e9b824be688526c3efbdc970316942 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 0ee7b0de..267ebc40 100644
+index 1ccca2f0..0effaf7b 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
-@@ -48,6 +48,9 @@ public abstract class DefinedPacket
+@@ -80,6 +80,9 @@ public abstract class DefinedPacket
          }
      }
 
@@ -72,7 +72,7 @@ index 0ee7b0de..267ebc40 100644
      public static void writeString(String s, ByteBuf buf)
      {
          writeString( s, buf, Short.MAX_VALUE );
-@@ -250,13 +253,18 @@ public abstract class DefinedPacket
+@@ -282,13 +285,18 @@ public abstract class DefinedPacket
          byte in;
          while ( true )
          {
@@ -221,5 +221,5 @@ index ac99d02c..0c1ecfb8 100644
 
              // Waterfall start
 -- 
-2.49.0
+2.39.5
 

BungeeCord-Patches/0054-Additional-DoS-mitigations.patch

@@ -1,4 +1,4 @@
-From 368c75dee528a0babbd8036944a9b3dea1914ce7 Mon Sep 17 00:00:00 2001
+From fefdea2be192142e61f626fc652155c280cf98ce 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,26 +8,26 @@ 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 267ebc40..adfcc189 100644
+index 0effaf7b..f11e9f37 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
-@@ -92,6 +92,7 @@ public abstract class DefinedPacket
+@@ -124,6 +124,7 @@ public abstract class DefinedPacket
          int len = readVarInt( buf );
          if ( len > maxLen * 3 )
          {
 +            if(!MinecraftDecoder.DEBUG) throw STRING_TOO_MANY_BYTES_EXCEPTION; // Waterfall start: Additional DoS mitigations
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
          }
 
-@@ -100,6 +101,7 @@ public abstract class DefinedPacket
+@@ -132,6 +133,7 @@ public abstract class DefinedPacket
 
          if ( s.length() > maxLen )
          {
 +            if(!MinecraftDecoder.DEBUG) throw STRING_TOO_LONG_EXCEPTION; // Waterfall start: Additional DoS mitigations
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
          }
 
-@@ -602,4 +604,21 @@ public abstract class DefinedPacket
+@@ -634,4 +636,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,25 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
+@@ -73,6 +79,11 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
              out.add( new PacketWrapper( packet, slice, protocol ) );
              slice = null;
          } catch (BadPacketException | IndexOutOfBoundsException e) {
@@ -88,6 +88,18 @@ 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);
@@ -97,18 +109,6 @@ 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
          {
@@ -257,5 +257,5 @@ index 738f0c92..ec33d337 100644
 +    // Waterfall end
  }
 -- 
-2.49.0
+2.39.5
 

BungeeCord-Patches/0060-Add-protocol-version-to-packet-not-found-message.patch

@@ -1,15 +1,15 @@
-From 9c60ddc08d5a6065c44455d70b6cf5e0ea225e2a Mon Sep 17 00:00:00 2001
+From 11fdb7305c264c8bb5a8b2f9dfaa1533c83e80dc 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
 
 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 d6c76a5b..2bc61878 100644
+index 545f33dd..f3a3c713 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
-@@ -1076,9 +1076,12 @@ public enum Protocol
+@@ -1130,9 +1130,12 @@ public enum Protocol
              {
                  throw new BadPacketException( "Unsupported protocol version" );
              }
@@ -25,5 +25,5 @@ index d6c76a5b..2bc61878 100644
      }
  }
 -- 
-2.49.0
+2.39.5
 

BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch

@@ -1,14 +1,14 @@
-From 12045a5e6c9ba7ad9b1d11ef5f45d71629a2567f Mon Sep 17 00:00:00 2001
+From a39cfd90ee4d1ef08c9afc90d620323db9392f9e 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
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
-index aaf70d03..9c5240e5 100644
+index 46f568b3..48048202 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
-@@ -312,5 +312,9 @@ public abstract class AbstractPacketHandler
+@@ -307,5 +307,9 @@ public abstract class AbstractPacketHandler
      public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
      {
      }
@@ -19,10 +19,10 @@ index aaf70d03..9c5240e5 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 2bc61878..7fc95fce 100644
+index f3a3c713..b4d980b5 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
-@@ -635,6 +635,13 @@ public enum Protocol
+@@ -651,6 +651,13 @@ public enum Protocol
                      map( ProtocolConstants.MINECRAFT_1_21_2, 0x07 ),
                      map( ProtocolConstants.MINECRAFT_1_21_6, 0x08 )
              );
@@ -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..264cb648 100644
+index e416f753..e905d237 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
@@ -113,7 +113,7 @@ index e416f753..264cb648 100644
 +        // Waterfall start
 +        return handleChat(message, null);
 +    }
-+    private String handleChat(String message, @javax.annotation.Nullable ClientCommand clientCommand)
++    private String handleChat(String message, ClientCommand clientCommand)
 +    // Waterfall end
      {
          for ( int index = 0, length = message.length(); index < length; index++ )
@@ -133,5 +133,5 @@ index e416f753..264cb648 100644
          throw CancelSendSignal.INSTANCE;
      }
 -- 
-2.49.0
+2.39.5