Updated Upstream (BungeeCord)

BungeeCord

@@ -1 +1 @@
-Subproject commit 68200133b6aa06d9fd257e47c11cfe734ec001bf
+Subproject commit c7adcf9fdf9c4aaf748d7ba2bf5b303bf6156cf1

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

@@ -1,4 +1,4 @@
-From 55c22f21707d2e9e81d2691c12f3a990b0c28c3d Mon Sep 17 00:00:00 2001
+From bdc30eaf00e869918b59265da8b7137306ebc051 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
@@ -43,7 +43,7 @@ index 70b292f0..91f71c09 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 3f01fb24..0afa455f 100644
+index a99d9914..1683ca6d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -251,7 +251,7 @@ public class ServerConnector extends PacketHandler
@@ -56,10 +56,10 @@ index 3f01fb24..0afa455f 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 05cdf684..cc0edeb8 100644
+index e133d933..e2fe18a1 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
-@@ -293,7 +293,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -294,7 +294,7 @@ public class DownstreamBridge extends PacketHandler
  
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@@ -82,5 +82,5 @@ index 5b9c35d1..2d6885a9 100644
      {
          @Override
 -- 
-2.41.0.windows.1
+2.40.1.windows.1
 

BungeeCord-Patches/0015-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From feede4c38be31f029da9c86306795c9b94ae1e69 Mon Sep 17 00:00:00 2001
+From e173c3c8d13d6ea60d8dabd6b2f30b1ee7e67c07 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,10 +8,10 @@ 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 1059c67f..889e60c2 100644
+index e2fe18a1..99fa3b24 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
-@@ -275,7 +275,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -276,7 +276,6 @@ public class DownstreamBridge extends PacketHandler
      @SuppressWarnings("checkstyle:avoidnestedblocks")
      public void handle(PluginMessage pluginMessage) throws Exception
      {
@@ -19,7 +19,7 @@ index 1059c67f..889e60c2 100644
          PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
  
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -302,6 +301,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -303,6 +302,7 @@ public class DownstreamBridge extends PacketHandler
  
          if ( pluginMessage.getTag().equals( "BungeeCord" ) )
          {
@@ -28,5 +28,5 @@ index 1059c67f..889e60c2 100644
              String subChannel = in.readUTF();
  
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch

@@ -1,4 +1,4 @@
-From 3d566b44103875552570fe60c2810ee911736707 Mon Sep 17 00:00:00 2001
+From 93cf44bd32d98d76176be7e214346ee4b0621fe3 Mon Sep 17 00:00:00 2001
 From: Johannes Donath <johannesd@torchmind.com>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -107,5 +107,5 @@ index 37a17c21..e87cd53a 100644
          boolean isRegisteredCommand = false;
  
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0017-Resolve-sendData-deadlocks.patch

@@ -1,47 +0,0 @@
-From 1371c7a0ef5af1684661cee2af8c8fbe8c761b36 Mon Sep 17 00:00:00 2001
-From: Tux <write@imaginarycode.com>
-Date: Fri, 12 Feb 2016 23:55:53 -0500
-Subject: [PATCH] Resolve sendData() deadlocks
-
-
-diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-index 4bb0f68f..9d581d9a 100644
---- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-@@ -110,19 +110,22 @@ public class BungeeServerInfo implements ServerInfo
-         Preconditions.checkNotNull( channel, "channel" );
-         Preconditions.checkNotNull( data, "data" );
- 
--        synchronized ( packetQueue )
--        {
--            Server server = ( players.isEmpty() ) ? null : players.iterator().next().getServer();
--            if ( server != null )
--            {
--                server.sendData( channel, data );
--                return true;
--            } else if ( queue )
--            {
--                packetQueue.add( new PluginMessage( channel, data, false ) );
-+        Server server;
-+
-+        synchronized (players) {
-+            server = players.isEmpty() ? null : players.iterator().next().getServer();
-+        }
-+
-+        if (server != null) {
-+            server.sendData(channel, data);
-+            return true;
-+        } else if (queue) {
-+            synchronized (packetQueue) {
-+                packetQueue.add(new PluginMessage(channel, data, false));
-             }
--            return false;
-         }
-+
-+        return false;
-     }
- 
-     private long lastPing;
--- 
-2.30.1 (Apple Git-130)
-

BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch

@@ -1,4 +1,4 @@
-From 023d412da1f2d78c1e8f60fbaf92abf5a91016ff Mon Sep 17 00:00:00 2001
+From 003d8774168ddbc73f7b3192f791d1aefbf36358 Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Improve server list ping logging
@@ -7,7 +7,7 @@ This functionality of this patch was adopted upstream, however, this
 patch remains for a few misc improvements around here
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 66f0d0a2..9f36f606 100644
+index 536fd38e..ab9a5eeb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -464,6 +464,6 @@ public class ServerConnector extends PacketHandler
@@ -19,10 +19,10 @@ index 66f0d0a2..9f36f606 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 b3fe9a64..f84554dd 100644
+index 99fa3b24..9e1a6d35 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
-@@ -708,6 +708,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -740,6 +740,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -69,5 +69,5 @@ index e87cd53a..c30093d7 100644
      }
  }
 -- 
-2.41.0.windows.1
+2.40.1.windows.1
 

BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch

@@ -1,4 +1,4 @@
-From 23174941bfb0c6555ef478b0043823b1ba60594e Mon Sep 17 00:00:00 2001
+From a63aedcf577eb1af8a0b71070c5b75fbe44bc21d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sun, 7 Feb 2016 00:01:19 -0700
 Subject: [PATCH] Add a property to accept invalid ping packets
@@ -9,7 +9,7 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
 Fixes #23
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 562afbaa..fd03d152 100644
+index b8450c28..c3db43e6 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
 @@ -300,10 +300,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -29,5 +29,5 @@ index 562afbaa..fd03d152 100644
          disconnect( "" );
      }
 -- 
-2.37.1
+2.40.1.windows.1
 

BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch

@@ -1,4 +1,4 @@
-From 40bdf52eae5d4d492216601188a4c54dbb00cc1c Mon Sep 17 00:00:00 2001
+From 08edeb3dbe51a304fcbcd2d0c326ee5fbdb97e1c Mon Sep 17 00:00:00 2001
 From: kamcio96 <k.nadworski@icloud.com>
 Date: Mon, 14 Mar 2016 16:07:20 -0700
 Subject: [PATCH] Use a worker and a boss event loop group.
@@ -8,7 +8,7 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
 This is proper practice for netty.
 
 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 c036b613..f7794f66 100644
+index b09afd88..93a96bfd 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -120,7 +120,7 @@ public class BungeeCord extends ProxyServer
@@ -70,10 +70,10 @@ index c036b613..f7794f66 100644
  
          getLogger().info( "Thank you and goodbye" );
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-index 51b2a324..634dfca7 100644
+index 671cf96f..377df7ec 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-@@ -184,7 +184,7 @@ public class BungeeServerInfo implements ServerInfo
+@@ -185,7 +185,7 @@ public class BungeeServerInfo implements ServerInfo
          };
          new Bootstrap()
                  .channel( PipelineUtils.getChannel( socketAddress ) )
@@ -83,5 +83,5 @@ index 51b2a324..634dfca7 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
                  .remoteAddress( socketAddress )
 -- 
-2.40.0
+2.40.1.windows.1
 

BungeeCord-Patches/0021-Better-Decompression-Sanity.patch

@@ -1,4 +1,4 @@
-From 308ef44c07acd33e80920f2134af7472d0221f4b Mon Sep 17 00:00:00 2001
+From 2e8d0e2f54c4cac318d48814f4cf6e66d44516ec Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Fri, 18 Mar 2016 10:53:24 -0700
 Subject: [PATCH] Better Decompression Sanity
@@ -58,5 +58,5 @@ index 6be2d942..6dc5633f 100644
          if ( compressionThreshold == -1 )
          {
 -- 
-2.30.1 (Apple Git-130)
+2.40.1.windows.1
 

BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch

@@ -1,4 +1,4 @@
-From e497a697d54e977d9ee969852cd84011c70bf435 Mon Sep 17 00:00:00 2001
+From f6d180f63becd8711925539129457ea633732987 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 25 Oct 2016 12:34:41 -0400
 Subject: [PATCH] Validate that chat messages are non-blank
@@ -32,5 +32,5 @@ index c30093d7..7fb79bfd 100644
          ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
          if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
 -- 
-2.40.0
+2.40.1.windows.1
 

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

@@ -1,4 +1,4 @@
-From d1323d4e9c014a055817c840b85918e12b1d7add Mon Sep 17 00:00:00 2001
+From 7b19b18ac258549d811ee62556273443af4f91e5 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.

BungeeCord-Patches/0024-Add-callEvent-shortcut-to-Event.patch

@@ -1,4 +1,4 @@
-From fac41e3a38b4f6285700c2527da3e9bbbdb5087e Mon Sep 17 00:00:00 2001
+From 7e6f839b07f0dc1edbd84e6091ae70015ed4c823 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 14 Apr 2019 19:15:00 +0300
 Subject: [PATCH] Add callEvent() shortcut to Event
@@ -28,5 +28,5 @@ index e2e01ecb..25ec1bd8 100644
 +    // Waterfall end
  }
 -- 
-2.30.1 (Apple Git-130)
+2.40.1.windows.1
 

BungeeCord-Patches/0025-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From 19b68d7b84a52a3bb92adb369b609298b37d352a Mon Sep 17 00:00:00 2001
+From c84676969bbc1d716f1f5c26d1f6146fa1f10ebf Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@@ -62,7 +62,7 @@ index 0e1ef5c4..ee63732d 100644
      @Deprecated
      public String getKickReason()
 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 9f36f606..6473a10c 100644
+index ab9a5eeb..d45d46e8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -381,7 +381,7 @@ public class ServerConnector extends PacketHandler
@@ -75,10 +75,10 @@ index 9f36f606..6473a10c 100644
          {
              // Pre cancel the event if we are going to try another server
 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 f84554dd..e8ef17a1 100644
+index 9e1a6d35..fd100f15 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
-@@ -90,16 +90,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -91,16 +91,19 @@ public class DownstreamBridge extends PacketHandler
              return;
          }
  
@@ -103,7 +103,7 @@ index f84554dd..e8ef17a1 100644
      }
  
      @Override
-@@ -114,7 +117,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -115,7 +118,19 @@ public class DownstreamBridge extends PacketHandler
  
          if ( !server.isObsolete() )
          {
@@ -124,7 +124,7 @@ index f84554dd..e8ef17a1 100644
          }
  
          ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -582,7 +597,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -614,7 +629,11 @@ public class DownstreamBridge extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@@ -138,5 +138,5 @@ index f84554dd..e8ef17a1 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.41.0.windows.1
+2.40.1.windows.1
 

BungeeCord-Patches/0026-Configurable-server-version-in-ping-response.patch

@@ -1,4 +1,4 @@
-From 9ddaf6095bd50bf2c70d7fbf08bec00b0060105d Mon Sep 17 00:00:00 2001
+From 79bc7220687da8644aeef975d5a36ff5c5db980e Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 13:56:57 -0500
 Subject: [PATCH] Configurable server version in ping response

BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch

@@ -1,4 +1,4 @@
-From 57112a8044943dd7303081a47fc826d3c339154e Mon Sep 17 00:00:00 2001
+From 8d5a6970594e5b5bfadae8170663109ec07b017f 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,7 +6,7 @@ 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 e7ab62e5..684eb883 100644
+index c3848b3c..a441a424 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
 @@ -126,6 +126,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
@@ -75,7 +75,7 @@ index e7ab62e5..684eb883 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 8268e30b..ccb9efdc 100644
+index 4b530a8b..32d222f7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -255,9 +255,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -109,5 +109,5 @@ index 8268e30b..ccb9efdc 100644
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
 -- 
-2.35.3
+2.40.1.windows.1
 

BungeeCord-Patches/0028-Proxy-query-event.patch

@@ -1,4 +1,4 @@
-From dad0bc898469685c8de63dd5fba41e50d048da34 Mon Sep 17 00:00:00 2001
+From 01471be41e093604d6aef19903e70692f88f254b Mon Sep 17 00:00:00 2001
 From: minecrafter <unknown@unknown>
 Date: Sun, 3 Jul 2016 04:03:21 -0400
 Subject: [PATCH] Proxy query event
@@ -211,5 +211,5 @@ index 9b81197f..ac99d02c 100644
              } else
              {
 -- 
-2.30.1 (Apple Git-130)
+2.40.1.windows.1
 

BungeeCord-Patches/0029-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch

@@ -1,11 +1,11 @@
-From a74bf9b63a72510f15b4a3aec96d28209348538b Mon Sep 17 00:00:00 2001
+From 1cf3795e22961841cf6ed93a2d79e242d452aabe Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 4 Aug 2016 19:30:49 -0700
 Subject: [PATCH] Dump the raw hex of a packet on a decoding error
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index 5e03e175..961887c9 100644
+index 57bd22b7..c3e1ac77 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 @@ -1,7 +1,9 @@
@@ -53,5 +53,5 @@ index 5e03e175..961887c9 100644
          {
              if ( slice != null )
 -- 
-2.30.1 (Apple Git-130)
+2.40.1.windows.1
 

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

@@ -1,4 +1,4 @@
-From ffc7cfe376ea12c3232492bcaad76e04c6b138db Mon Sep 17 00:00:00 2001
+From 1a52982fef14b2372aa9e0bc1e3a0bd02e0d63e2 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
@@ -160,7 +160,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 846f8338..7fe08ecd 100644
+index 32d222f7..e0a9d338 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 @@
@@ -185,10 +185,10 @@ index 846f8338..7fe08ecd 100644
      @Getter
      private String displayName;
 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 e8ef17a1..c7180803 100644
+index fd100f15..faf5b97a 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
-@@ -51,6 +51,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
+@@ -52,6 +52,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
  import net.md_5.bungee.protocol.ProtocolConstants;
  import net.md_5.bungee.protocol.packet.BossBar;
  import net.md_5.bungee.protocol.packet.Commands;
@@ -197,7 +197,7 @@ index e8ef17a1..c7180803 100644
  import net.md_5.bungee.protocol.packet.KeepAlive;
  import net.md_5.bungee.protocol.packet.Kick;
  import net.md_5.bungee.protocol.packet.PlayerListItem;
-@@ -682,6 +684,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -714,6 +716,32 @@ public class DownstreamBridge extends PacketHandler
          }
      }
  
@@ -268,5 +268,5 @@ index d15044f4..bea2bbff 100644
       * Sends the server mod list to the client, or stores it for sending later.
       *
 -- 
-2.37.3.windows.1
+2.40.1.windows.1
 

BungeeCord-Patches/0031-Optionally-use-async-Netty-DNS-resolver.patch

@@ -1,4 +1,4 @@
-From c9bd6b4fc34e508d86cfc04bb5adec3f33a56f38 Mon Sep 17 00:00:00 2001
+From 6bb4f3214fe5957bf29294a14cc937ea1480cb62 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 03:13:03 -0500
 Subject: [PATCH] Optionally use async Netty DNS resolver
@@ -24,7 +24,7 @@ index 749059ab..6141128b 100644
  
      /**
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 233c6aae..54061ec5 100644
+index 1aed79b9..e3bbd6c7 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -34,6 +34,18 @@
@@ -175,5 +175,5 @@ index e0c52f21..37337429 100644
 +    // Waterfall End
  }
 -- 
-2.17.2 (Apple Git-113)
+2.40.1.windows.1
 

BungeeCord-Patches/0032-Improve-outdated-build-message.patch

@@ -1,4 +1,4 @@
-From a9437edffbbe4bbee2b0521cf894a413c845a3cc Mon Sep 17 00:00:00 2001
+From c790d81e0a50acd0f9412691a042c3e5837b3fa5 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Sat, 10 Jun 2017 20:56:02 +0100
 Subject: [PATCH] Improve outdated build message
@@ -26,5 +26,5 @@ index 39fc55f9..c81a4430 100644
          }
  
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0033-Fix-some-forge-plugin-message-packets-not-being-forw.patch

@@ -1,4 +1,4 @@
-From 71d876da0ca5d9b2c2a17f04dad395c80d22fcdc Mon Sep 17 00:00:00 2001
+From aafec0af8ddecaf34c20c63e36b74ea7e1eb9178 Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Mon, 17 Jul 2017 20:24:17 +0100
 Subject: [PATCH] Fix some forge plugin message packets not being forwarded
@@ -55,5 +55,5 @@ index 77d18e6d..d254b84e 100644
              synchronized ( packetQueue )
              {
 -- 
-2.30.1 (Apple Git-130)
+2.40.1.windows.1
 

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

@@ -1,4 +1,4 @@
-From 8e7c12064010cb7ea8137814837f97a2b1ca1e9e Mon Sep 17 00:00:00 2001
+From bc12db36136b2710542375b3ee13a01cda08f555 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
 
 
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index e5797d70..8328e576 100644
+index 4c779570..8518776d 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -49,6 +49,9 @@
@@ -233,7 +233,7 @@ index 00000000..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 1bf8b510..d333a528 100644
+index f911bd7b..1cf3f48a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -55,12 +55,13 @@
@@ -253,7 +253,7 @@ index 1bf8b510..d333a528 100644
      </modules>
  
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index aa91ee5a..83d8719b 100644
+index e3bbd6c7..2220837a 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -71,7 +71,7 @@
@@ -281,7 +281,7 @@ index aa91ee5a..83d8719b 100644
              <groupId>net.sf.jopt-simple</groupId>
              <artifactId>jopt-simple</artifactId>
 @@ -130,6 +131,35 @@
-             <version>1.9.10</version>
+             <version>1.7.3</version>
              <scope>runtime</scope>
          </dependency>
 +        <!-- Waterfall start - Console improvements - bring back slf4j-->
@@ -1629,5 +1629,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.41.0
+2.40.1.windows.1
 

BungeeCord-Patches/0035-Handle-plugin-prefixes-using-Log4J.patch

@@ -1,4 +1,4 @@
-From c5f2b6c6c44ec721a353ee2c3621feca1f75b70a Mon Sep 17 00:00:00 2001
+From e403185445c2ad2dd100e119b7ddb9a43ff81b8e Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:07:31 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J
@@ -45,5 +45,5 @@ index cfd039cd..8e49e002 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.35.1
+2.40.1.windows.1
 

BungeeCord-Patches/0036-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,11 +1,11 @@
-From 477511185022dd5740bc7c4dbf3f6ab5787ed49e Mon Sep 17 00:00:00 2001
+From f46da020f98142c04eb9a3c82116cd3b346dd64b Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:15:09 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
 
 
 diff --git a/api/pom.xml b/api/pom.xml
-index 83ae2220..01b8f888 100644
+index 1b4db8b6..51aab084 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -75,5 +75,11 @@
@@ -39,7 +39,7 @@ index 9660234d..3d1e9a3a 100644
       * Called when the plugin has just been loaded. Most of the proxy will not
       * be initialized, so only use it for registering
 diff --git a/log4j/pom.xml b/log4j/pom.xml
-index a7d2aa8f..976b8079 100644
+index 1cc7936e..e83b2f21 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
 @@ -38,6 +38,24 @@
@@ -68,5 +68,5 @@ index a7d2aa8f..976b8079 100644
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.41.0.windows.1
+2.40.1.windows.1
 

BungeeCord-Patches/0037-Add-Log4j-configuration-that-replicates-the-old-Bung.patch

@@ -1,4 +1,4 @@
-From 3d6b47a2d059f408afdcd3e65c60ba6a127a2e4b Mon Sep 17 00:00:00 2001
+From 0c9404439ee8f17cd6760ecd910cf08cc44dd41f Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sun, 24 Sep 2017 12:06:49 +0200
 Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord
@@ -47,5 +47,5 @@ index 00000000..6e9c09c5
 +    </Loggers>
 +</Configuration>
 -- 
-2.30.1 (Apple Git-130)
+2.40.1.windows.1
 

BungeeCord-Patches/0038-Add-console-command-completion.patch

@@ -1,4 +1,4 @@
-From eb704457c300f3f8ab8a28a784a926e746554119 Mon Sep 17 00:00:00 2001
+From 82815e30189614a4286d42db9461768f0f89cb46 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 26 Sep 2017 18:59:37 +0200
 Subject: [PATCH] Add console command completion
@@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
      }
  
 -- 
-2.37.3.windows.1
+2.40.1.windows.1
 

BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch

@@ -1,4 +1,4 @@
-From 730364aac5da3bcc5448a242e4d3b6f8525e2528 Mon Sep 17 00:00:00 2001
+From 09cba4645420edf1df558fdb045ced3dcd12e77f Mon Sep 17 00:00:00 2001
 From: phenomax <phenomax@revayd.net>
 Date: Thu, 10 Aug 2017 18:41:17 +0200
 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@@ -52,7 +52,7 @@ similarity index 100%
 rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
 rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
 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 cd0a459c..935daa5d 100644
+index c3db43e6..96528023 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
 @@ -627,7 +627,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -65,5 +65,5 @@ index cd0a459c..935daa5d 100644
  
      @Override
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch

@@ -1,4 +1,4 @@
-From 519419cfd04478fc029bcc932a5dc5b102410f2a Mon Sep 17 00:00:00 2001
+From b7536e223a38de079e58576df5a9d8e65e46c84b Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Thu, 8 Feb 2018 19:10:52 +0100
 Subject: [PATCH] Optionally log InitialHandler connections
@@ -61,7 +61,7 @@ index ef44d334..4ff8da6d 100644
      public String getGameVersion() {
          return gameVersion;
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 935daa5d..ddc04fda 100644
+index 96528023..de6c8244 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
 @@ -355,7 +355,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -77,5 +77,5 @@ index 935daa5d..ddc04fda 100644
                  ch.setProtocol( Protocol.LOGIN );
  
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch

@@ -1,11 +1,11 @@
-From 270491b5947c02fdb02fa2ef25a5741f1e9465cb Mon Sep 17 00:00:00 2001
+From b6301e5134e0f47c00c4ed83487b8df93b1dba29 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Mon, 28 May 2018 21:43:55 +0100
 Subject: [PATCH] Forge is a first class citizen
 
 
 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 22f5243f..ef4e5edf 100644
+index 71bb3d9d..5cc308b8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -290,8 +290,6 @@ public class BungeeCord extends ProxyServer
@@ -31,5 +31,5 @@ index 7094fe0b..8911bee8 100644
      @Synchronized("serversLock") // Waterfall
      public void load()
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0042-Ignore-empty-packets.patch

@@ -1,4 +1,4 @@
-From 3edeced9d513fbec1cbcc5cb8600907633e23b68 Mon Sep 17 00:00:00 2001
+From ff960a752b0b116eb6889d75f7f1969a4d22525b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 12 Oct 2018 14:28:52 +0100
 Subject: [PATCH] Ignore empty packets
@@ -8,7 +8,7 @@ packets will be ignored. While empty packets are a sign of bad plugins,
 they are effectivly harmless vs the cost of the exception in general
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index 961887c9..8b7e0708 100644
+index c3e1ac77..b68b33a9 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 @@ -43,6 +43,12 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -25,7 +25,7 @@ index 961887c9..8b7e0708 100644
              packetTypeInfo = packetId;
  
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
-index 647394ba..f297620c 100644
+index 277e70e8..cf7dea17 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
 @@ -40,7 +40,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
@@ -38,5 +38,5 @@ index 647394ba..f297620c 100644
                      throw new CorruptedFrameException( "Empty Packet!" );
                  }
 -- 
-2.30.1 (Apple Git-130)
+2.40.1.windows.1
 

BungeeCord-Patches/0043-Don-t-use-a-bytebuf-for-packet-decoding.patch

@@ -1,4 +1,4 @@
-From bc1b94faf6edb72a90f148a3638fff1de2eabcf4 Mon Sep 17 00:00:00 2001
+From 5daa815f0cc32e329cb4df94fe99662b049950fd Mon Sep 17 00:00:00 2001
 From: creeper123123321 <creeper123123321@gmail.com>
 Date: Thu, 17 Jan 2019 03:25:59 +0000
 Subject: [PATCH] Don't use a bytebuf for packet decoding
@@ -66,5 +66,5 @@ index cf7dea17..3a802ca4 100644
              }
          }
 -- 
-2.40.0
+2.40.1.windows.1
 

BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch

@@ -1,4 +1,4 @@
-From acaac51b18fa6e8bc1f2b1dacc77565ff7595648 Mon Sep 17 00:00:00 2001
+From b995f498698c773fa399ccfb76ac53fce6e3438e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 14 Jan 2019 03:35:21 +0000
 Subject: [PATCH] Provide an option to disable entity metadata rewriting
@@ -57,7 +57,7 @@ index 4ff8da6d..e860214f 100644
 +    }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 6473a10c..60232e52 100644
+index d45d46e8..5bec25d1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -240,7 +240,7 @@ public class ServerConnector extends PacketHandler
@@ -136,10 +136,10 @@ index e0a9d338..35bf4c9f 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 c7180803..04840037 100644
+index faf5b97a..07e82e3c 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
-@@ -688,6 +688,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -720,6 +720,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(EntityEffect entityEffect) throws Exception
      {
@@ -147,7 +147,7 @@ index c7180803..04840037 100644
          // Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
          // condition on the client.
          if (this.con.getForgeClientHandler().isForgeUser() && !this.con.getForgeClientHandler().isHandshakeComplete()) {
-@@ -699,6 +700,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -731,6 +732,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(EntityRemoveEffect removeEffect) throws Exception
      {
@@ -224,5 +224,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.41.0.windows.1
+2.40.1.windows.1
 

BungeeCord-Patches/0045-Add-ProxyDefineCommandsEvent.patch

@@ -1,4 +1,4 @@
-From 1723728a7c34cc7d08fa4c4c4f172e0656835716 Mon Sep 17 00:00:00 2001
+From b8ab200096dff40f7d50f5e37a545a5d79ef62bd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 14 Mar 2019 07:44:06 +0000
 Subject: [PATCH] Add ProxyDefineCommandsEvent
@@ -54,7 +54,7 @@ index 00000000..1fd4fc90
 +
 +}
 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 5105df8b..490171c4 100644
+index 07e82e3c..c574eef8 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
 @@ -19,8 +19,10 @@ import io.netty.channel.unix.DomainSocketAddress;
@@ -68,7 +68,7 @@ index 5105df8b..490171c4 100644
  import lombok.RequiredArgsConstructor;
  import net.md_5.bungee.ServerConnection;
  import net.md_5.bungee.ServerConnection.KeepAliveData;
-@@ -723,9 +725,25 @@ public class DownstreamBridge extends PacketHandler
+@@ -755,9 +757,25 @@ public class DownstreamBridge extends PacketHandler
      {
          boolean modified = false;
  
@@ -97,5 +97,5 @@ index 5105df8b..490171c4 100644
                  CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
                          .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0046-Fix-upstream-javadocs.patch

@@ -1,4 +1,4 @@
-From 658ea2fe15fc6d455beb8cc4d5d271e29fcb155d Mon Sep 17 00:00:00 2001
+From ae758be59959ecea398c5e661eeb22c587373e9f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 30 Mar 2019 15:11:11 +0000
 Subject: [PATCH] Fix upstream javadocs
@@ -104,5 +104,5 @@ index f3bced0a..4a198ee9 100644
      Favicon getFaviconObject();
  
 -- 
-2.37.2
+2.40.1.windows.1
 

BungeeCord-Patches/0047-OSX-native-zlib-and-crypto.patch

@@ -1,4 +1,4 @@
-From 893c4dbda0b4fa64d720f3ec510965b5aeb9df3f Mon Sep 17 00:00:00 2001
+From 40a29046d0f396aba2c6ca7dfce0c9042990dd75 Mon Sep 17 00:00:00 2001
 From: Colin Godsey <crgodsey@gmail.com>
 Date: Tue, 16 Apr 2019 07:25:52 -0600
 Subject: [PATCH] OSX native zlib and crypto
@@ -1215,5 +1215,5 @@ literal 0
 HcmV?d00001
 
 -- 
-2.37.2
+2.40.1.windows.1
 

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

@@ -1,4 +1,4 @@
-From a01c62131014500d4a4bb25aa7afaaf738a3342b Mon Sep 17 00:00:00 2001
+From 9f1eb2e71f95c0cd107d1e1d1904fd9ad0c3cabc 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
@@ -146,7 +146,7 @@ index b68b33a9..f5e414c1 100644
          {
              if ( slice != null )
 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 707232a5..600037f4 100644
+index de6c8244..a93bad2e 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
 @@ -16,6 +16,8 @@ import java.util.Set;
@@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644
  
              // Waterfall start
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0049-ConnectionInitEvent.patch

@@ -1,4 +1,4 @@
-From 7bca0d049e00a28e4cedbfcccc7f02a5572ecb57 Mon Sep 17 00:00:00 2001
+From ff901f2e7bf4c152914edb4843b2f2d314cf56b3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 2 Dec 2019 11:35:17 +0000
 Subject: [PATCH] ConnectionInitEvent
@@ -119,5 +119,5 @@ index 3f30da0c..af65e192 100644
      };
      public static final Base BASE = new Base( false );
 -- 
-2.40.0
+2.40.1.windows.1
 

BungeeCord-Patches/0050-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From d3707353a4b8be0fa47a5fa155bb44520914a383 Mon Sep 17 00:00:00 2001
+From 97dcfd420611d820b4e64396e64d9996f7d2eea7 Mon Sep 17 00:00:00 2001
 From: theminecoder <theminecoder.dev@gmail.com>
 Date: Wed, 22 Apr 2020 14:00:44 +1000
 Subject: [PATCH] Add exception reporting event
@@ -642,7 +642,7 @@ index fbfbd546..ae85a1d4 100644
  
      @EventHandler
 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 ef4e5edf..15fb4ad2 100644
+index 5cc308b8..3a86fac8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -11,6 +11,8 @@ import com.google.gson.Gson;
@@ -695,5 +695,5 @@ index 38b75b51..02ec98fc 100644
  
              // If we have a period of 0 or less, only run once
 -- 
-2.37.3.windows.1
+2.40.1.windows.1
 

BungeeCord-Patches/0051-Allow-to-disable-tablist-rewrite.patch

@@ -1,4 +1,4 @@
-From 7d1a9e8645b530dc87f51d40cec9ba8ce3f6edac Mon Sep 17 00:00:00 2001
+From 8c9ad6853f1a8ce5d26c2ac9d2b207f5f165acb3 Mon Sep 17 00:00:00 2001
 From: xDark <aleshkailyashevich@gmail.com>
 Date: Fri, 31 May 2019 08:11:31 +0300
 Subject: [PATCH] Allow to disable tablist rewrite
@@ -50,10 +50,10 @@ 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 490171c4..0c9cfb02 100644
+index c574eef8..e342952d 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
-@@ -170,8 +170,14 @@ public class DownstreamBridge extends PacketHandler
+@@ -171,8 +171,14 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(PlayerListItem playerList) throws Exception
      {
@@ -71,5 +71,5 @@ index 490171c4..0c9cfb02 100644
  
      @Override
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0052-Remove-version-from-brand-info.patch

@@ -1,14 +1,14 @@
-From bb5732db8c6fa66d335f6d46b3c07f9444a613c7 Mon Sep 17 00:00:00 2001
+From 4daf5a93e524cf2794dad888318448f67dd300ee Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 20 Jun 2020 18:21:17 +0100
 Subject: [PATCH] Remove version from brand info
 
 
 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 0c9cfb02..89b98b36 100644
+index e342952d..1093c0ba 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
-@@ -316,7 +316,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -317,7 +317,7 @@ public class DownstreamBridge extends PacketHandler
              Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" );
  
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
@@ -18,5 +18,5 @@ index 0c9cfb02..89b98b36 100644
              brand.release();
              // changes in the packet are ignored so we need to send it manually
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0053-Add-auth-url-option.patch

@@ -1,11 +1,11 @@
-From e07001b69a3370c95044abfd165571726c00e20c Mon Sep 17 00:00:00 2001
+From 783bc13ec00f307120d65f1cc64135f693904d5a Mon Sep 17 00:00:00 2001
 From: theminecoder <theminecoder.dev@gmail.com>
 Date: Sun, 19 Jul 2020 10:18:23 +1000
 Subject: [PATCH] Add auth url option
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 4346696f..55620acc 100644
+index a93bad2e..d31901cc 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
 @@ -76,6 +76,8 @@ import net.md_5.bungee.util.QuietException;
@@ -27,5 +27,5 @@ index 4346696f..55620acc 100644
          Callback<String> handler = new Callback<String>()
          {
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0054-Add-the-ability-to-generate-decoder-traces-for-debug.patch

@@ -1,4 +1,4 @@
-From b6366cee1ab16d0c0ec04efd433f12e118206ad0 Mon Sep 17 00:00:00 2001
+From 6c6da9c0d2d577a864bb1dcff1bfca263d6ca659 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 15 Sep 2020 18:11:49 +0100
 Subject: [PATCH] Add the ability to generate decoder traces for debugging
@@ -40,5 +40,5 @@ index 2583aa2c..334d5054 100644
      }
  }
 -- 
-2.37.2
+2.40.1.windows.1
 

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

@@ -1,4 +1,4 @@
-From 811cfe0f1dfcae2fff7c333beb3a28ddbbf4d221 Mon Sep 17 00:00:00 2001
+From 94fd8a335bfd82366ab786ed6ff288bcae1eb9f5 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
@@ -167,7 +167,7 @@ index 63e9d18d..545eec72 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 5186a6a8..3224b0d2 100644
+index 5186a6a8..d0e37793 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
 @@ -65,4 +65,13 @@ public class LoginRequest extends DefinedPacket
@@ -235,5 +235,5 @@ index 738f0c92..ec33d337 100644
 +    // Waterfall end
  }
 -- 
-2.38.1
+2.40.1.windows.1
 

BungeeCord-Patches/0056-Add-support-for-hex-color-codes-in-console.patch

@@ -1,4 +1,4 @@
-From 792b25bd6d93cdf296150f8cce4dc127faf835e0 Mon Sep 17 00:00:00 2001
+From d1a65d15d6b5f2e8b12432a7868eb0752de6389c Mon Sep 17 00:00:00 2001
 From: Josh Roy <10731363+JRoy@users.noreply.github.com>
 Date: Sun, 21 Feb 2021 23:52:11 -0500
 Subject: [PATCH] Add support for hex color codes in console
@@ -242,5 +242,5 @@ index 00000000..5d1a6126
 +}
 +
 -- 
-2.37.2
+2.40.1.windows.1
 

BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch

@@ -1,4 +1,4 @@
-From 5b38d62ee22949fb09c3b833d49b73c10f52d32b Mon Sep 17 00:00:00 2001
+From 59dbfe7a7690b800b0269ec858f1c4d611362f48 Mon Sep 17 00:00:00 2001
 From: FivePB <admin@fivepb.me>
 Date: Tue, 16 Nov 2021 21:15:32 +0100
 Subject: [PATCH] Configurable plugin messaging limits

BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch

@@ -1,4 +1,4 @@
-From 1a76bca6c617df82e2f9d0fa7457d6b727eabb71 Mon Sep 17 00:00:00 2001
+From ef9720457e081a1e60b05ef669aec98ee2cd6f10 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

BungeeCord-Patches/0059-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch

@@ -1,4 +1,4 @@
-From 441c10ca0e6b479ad56718e9b17ad6d18f992afc Mon Sep 17 00:00:00 2001
+From cd4c416c7693ee613a7f49b556b47616af66f690 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

BungeeCord-Patches/0060-Improve-login-state-transition.patch

@@ -1,4 +1,4 @@
-From e9d0d6cd8b81b710b8c1c5f3e1f54b507363327b Mon Sep 17 00:00:00 2001
+From d9ae0a1acd0d606527e7d915f1a220f39318661f Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 8 May 2022 12:04:30 +0100
 Subject: [PATCH] Improve login state transition

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

@@ -1,4 +1,4 @@
-From 9d26478458acb2fb096822ff3a796795ad7fbb39 Mon Sep 17 00:00:00 2001
+From 4eb57b150a111d8e47a7b586b623cd8393189666 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

BungeeCord-Patches/0062-Expand-packet-decode-logging-usage.patch

@@ -1,4 +1,4 @@
-From 046016c634919b94cb990e4aa05e7b9cdc28f54d Mon Sep 17 00:00:00 2001
+From 3ba239e8f3af96e8a410698f17686b86a4785a52 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 19 Jun 2022 10:31:51 +0100
 Subject: [PATCH] Expand packet-decode-logging usage

BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch

@@ -1,4 +1,4 @@
-From 64bdfdccac0ae290d6a5767fbdd38f5245750e70 Mon Sep 17 00:00:00 2001
+From 3dabbbc15d5db57d5dccf97bac0c1c2b25553904 Mon Sep 17 00:00:00 2001
 From: Aurora <aurora@relanet.eu>
 Date: Mon, 18 Jul 2022 15:56:05 +0200
 Subject: [PATCH] Add message for outdated clients that don't support secure

BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch

@@ -1,4 +1,4 @@
-From b235367256f401fbc68e02e7d34bb7b568e4751c Mon Sep 17 00:00:00 2001
+From f834edf6801b27987f75562fb67598fd616f7eae 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.
@@ -19,10 +19,10 @@ index 3a86fac8..a7091ab6 100644
                      .childAttr( PipelineUtils.LISTENER, info )
                      .childHandler( PipelineUtils.SERVER_CHILD )
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-index 634dfca7..394804e8 100644
+index 377df7ec..8f531f85 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-@@ -183,7 +183,7 @@ public class BungeeServerInfo implements ServerInfo
+@@ -184,7 +184,7 @@ public class BungeeServerInfo implements ServerInfo
              }
          };
          new Bootstrap()

BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch

@@ -1,4 +1,4 @@
-From 89a9c3c9f0136f173f045385925357b6d9a9bc9b Mon Sep 17 00:00:00 2001
+From 247033063da2829bb71e1f264585834c1269c0c2 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 21 Apr 2023 15:32:33 +0100
 Subject: [PATCH] reduce log spam from clients registeirng too many channels