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:
1a807731 #3567: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3
772ad995 #3566: Bump actions/setup-java from 3 to 4
2431c40a #3562: Bump io.netty:netty-bom from 4.1.100.Final to 4.1.101.Final
8144ae8d #3555: Bump com.mysql:mysql-connector-j from 8.1.0 to 8.2.0
0757c39a Attempt upgrade of resolver libraries

BungeeCord

@@ -1 +1 @@
-Subproject commit 231024ba42851d991cf5ad7f18633b57dab07cbd
+Subproject commit 1a807731a5ad8e8771d0254fd06296aea4f4dd31

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 3b1984106e3bfd5e2504ae84797ec65d8a8dca42 Mon Sep 17 00:00:00 2001
+From 9ae84f2bd8435cc04badeccfde4fc367b42f6ca3 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 30739518..bdccbd78 100644
+index 57567988..3cd57d98 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,42 +4,42 @@
@@ -515,7 +515,7 @@ index a4265e54..5e9d29d7 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 9725c974..3a72aa08 100644
+index 6790d07b..3e08cb3c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -708,7 +708,7 @@ index 4d611101..76a3510d 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 335ee3d5..5558adfb 100644
+index 92d9d2fa..d1c4570d 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -857,5 +857,5 @@ index acb5201f..b7529bf3 100644
  
      <properties>
 -- 
-2.42.0
+2.43.0
 

BungeeCord-Patches/0002-Copy-license-files-into-jar.patch

@@ -1,11 +1,11 @@
-From f090bbf4ac1184c000210d21a7485c3cb7f24b13 Mon Sep 17 00:00:00 2001
+From 42086afe5cb8e7ec279421c3caf74fdf0ebbc413 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 18 Jul 2018 20:23:03 +0300
 Subject: [PATCH] Copy license files into jar
 
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 5135c0fd..233c6aae 100644
+index d1c4570d..fe1506e4 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -119,4 +119,26 @@
@@ -36,5 +36,5 @@ index 5135c0fd..233c6aae 100644
 +    <!-- Waterfall end -->
  </project>
 -- 
-2.17.2 (Apple Git-113)
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 9ec33f3c55ffd519b35f4a5a822db2e8d993a620 Mon Sep 17 00:00:00 2001
+From 50d10b53f384abd66b95bc44162db95203d97488 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
@@ -18,7 +18,7 @@ index f1ccd4f6..d703d6d2 100644
      }
  
 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 c2fe9a40..e3065f12 100644
+index 2024149f..db2a1b99 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -189,7 +189,7 @@ public class BungeeCord extends ProxyServer
@@ -88,7 +88,7 @@ index efe048c9..720d0c3b 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index 150d8739..8ae799c1 100644
+index de85f0b2..b9e99d6c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 @@ -216,7 +216,7 @@ public class YamlConfig implements ConfigurationAdapter
@@ -101,5 +101,5 @@ index 150d8739..8ae799c1 100644
              SocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.38.1
+2.43.0
 

BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch

@@ -1,4 +1,4 @@
-From 7443ac4a48f0afc87dd65b7b467cfc046d056720 Mon Sep 17 00:00:00 2001
+From a75ac072023f7ee77d4bd3754f538dd4d6c70aa8 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 25 Oct 2016 11:58:37 -0400
 Subject: [PATCH] Add Waterfall configuration files
@@ -118,5 +118,5 @@ index b9e99d6c..f6b5e8b8 100644
          if ( permissions == null )
          {
 -- 
-2.42.1
+2.43.0
 

BungeeCord-Patches/0005-Disable-Metrics.patch

@@ -1,4 +1,4 @@
-From d5aef08f1513e5e51b92d60e10e528d7b82ad40d Mon Sep 17 00:00:00 2001
+From 4c9105ed4439711a90b5702e1fc1b4a0d41cffc3 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Thu, 19 May 2016 10:55:20 -0700
 Subject: [PATCH] Disable Metrics
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Metrics
 MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
 
 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 f1ddb4d0..ffff990a 100644
+index 3429c989..e3eaee39 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -125,7 +125,7 @@ public class BungeeCord extends ProxyServer
@@ -177,5 +177,5 @@ index eabf7573..00000000
 -    }
 -}
 -- 
-2.38.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 1345e92a500c226958f02eb98417b117e6605371 Mon Sep 17 00:00:00 2001
+From f2f55cb7743a44bc8d0db757315cbfab4d43f22f 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
@@ -47,5 +47,5 @@ index 2536435c..5bb86152 100644
          } catch ( IOException ex )
          {
 -- 
-2.37.2.windows.2
+2.43.0
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,4 +1,4 @@
-From 41b5d168431b57ab75c13f908fdfec83b6081f19 Mon Sep 17 00:00:00 2001
+From 14cad935db7d6dbae502d46d976de2b9c65c9564 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
@@ -26,5 +26,5 @@ index 6cb4c798..680af7d3 100644
      {
  
 -- 
-2.39.2
+2.43.0
 

BungeeCord-Patches/0008-Presize-the-HTTP-response-buffer.patch

@@ -1,4 +1,4 @@
-From 0cf87c789c24e97cbadb74d50597c15d85006b26 Mon Sep 17 00:00:00 2001
+From 4632030b32001c18b65c883cab0de4f3688ed5c1 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 13 Apr 2016 15:17:05 -0400
 Subject: [PATCH] Presize the HTTP response buffer
@@ -6,7 +6,7 @@ Subject: [PATCH] Presize the HTTP response buffer
 16 characters is extremely small, and all responses start around 256 bytes. 640 characters seems to be good (covering skins and capes), based on sampling profile API responses.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
-index 596ced71..b91981e6 100644
+index a1e59b47..e2911d5e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
 @@ -16,7 +16,7 @@ public class HttpHandler extends SimpleChannelInboundHandler<HttpObject>
@@ -19,5 +19,5 @@ index 596ced71..b91981e6 100644
      @Override
      public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
 -- 
-2.30.1 (Apple Git-130)
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 27ac1313bc044e08eed698e65f5377ac69f0f31a Mon Sep 17 00:00:00 2001
+From b78e74b5f2a330f2b4544b9d601dc0703cf99aa3 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
@@ -82,5 +82,5 @@ index 5b9c35d1..2d6885a9 100644
      {
          @Override
 -- 
-2.39.2
+2.43.0
 

BungeeCord-Patches/0010-Optimize-uuid-conversions.patch

@@ -1,4 +1,4 @@
-From 89a9c5c99d3e2e00b2372939540a85567beffa21 Mon Sep 17 00:00:00 2001
+From c04feddfe062c0c5fe5b778a677aeb5d94f93cf7 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 14 Mar 2016 15:40:44 -0700
 Subject: [PATCH] Optimize uuid conversions
@@ -263,5 +263,5 @@ index b1b087aa..b51263a2 100644
  
      @Override
 -- 
-2.42.1
+2.43.0
 

BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch

@@ -1,4 +1,4 @@
-From 2977421f05d7f1f017682147111f7274c3ba0b91 Mon Sep 17 00:00:00 2001
+From 49b2baa3810475443e50eea4cb36919e94b87f3f Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Tue, 25 Oct 2016 12:23:07 -0400
 Subject: [PATCH] Add support for FML with IP Forwarding enabled
@@ -101,5 +101,5 @@ index 6dca2048..f5253b89 100644
       * The FML 1.8 handshake token.
       */
 -- 
-2.39.2
+2.43.0
 

BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch

@@ -1,11 +1,11 @@
-From c11014146824ca18446e6175026a088ca23a3369 Mon Sep 17 00:00:00 2001
+From 7f807c4653ad19c7c47a22495b081781ec9fee42 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 17:36:31 -0600
 Subject: [PATCH] Better unit tests for Chat API
 
 
 diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-index 1273e098..2907630d 100644
+index 5319ecf3..df7cf7c6 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 @@ -666,6 +666,26 @@ public class ComponentsTest
@@ -53,5 +53,5 @@ index 9ec5dcb1..e56c8353 100644
 +    }
  }
 -- 
-2.34.1
+2.43.0
 

BungeeCord-Patches/0013-Allow-removing-servers-or-changing-addresses-on-relo.patch

@@ -1,4 +1,4 @@
-From a761cca9133852a90022b32fa030a8c54da035a7 Mon Sep 17 00:00:00 2001
+From 3a0cdd8be9488802c79ab27cc6f92ce0b661624a Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 28 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Allow removing servers or changing addresses on reload
@@ -79,5 +79,5 @@ index 54a6cb38..ecd3b619 100644
  
          for ( ListenerInfo listener : listeners )
 -- 
-2.35.3
+2.43.0
 

BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch

@@ -1,4 +1,4 @@
-From 209fd1c50168f4b5d5db23d0cdd7aef25366d79b Mon Sep 17 00:00:00 2001
+From 191e3b8b67359f39bac4d62ee57796eb1e793ce3 Mon Sep 17 00:00:00 2001
 From: Harry <me@harry5573.uk>
 Date: Sun, 24 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Enable TCP_NODELAY.
@@ -18,5 +18,5 @@ index 2d6885a9..3f30da0c 100644
              ch.config().setWriteBufferWaterMark( MARK );
  
 -- 
-2.40.0
+2.43.0
 

BungeeCord-Patches/0015-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From b5d564124854f1fc8aedc8b5302d4c8098c6de8b Mon Sep 17 00:00:00 2001
+From 87cb9413787e84d11886b19ed594167c8138e688 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
@@ -28,5 +28,5 @@ index b7856d92..61ce9ed6 100644
              String subChannel = in.readUTF();
  
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 5bcf70b740e218893c47983c08cad7e9e6beb77c Mon Sep 17 00:00:00 2001
+From 0a9a8b758119babf7b970b147ead38f68ee6775c 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
@@ -100,5 +100,5 @@ index 9a47f2ec..b768d54a 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From e4cb9d47b2745b761f6c7fd60914ebdb140c695d Mon Sep 17 00:00:00 2001
+From fa78d85d4934194d4b6f0b47d30230fee35ce3db 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 460aa491..84be12e5 100644
          boolean isRegisteredCommand = false;
          boolean isCommand = tabComplete.getCursor().startsWith( "/" );
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 3709ce1b52ab1be9e6c6c228843138f44ec23b10 Mon Sep 17 00:00:00 2001
+From 4cc999421f4825bfa3bc5bfd5c298f6e0990a254 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
@@ -69,5 +69,5 @@ index 84be12e5..6acbf7bf 100644
      }
  }
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From d4a8080d52e0fbe372bbcdb375757d064e80f685 Mon Sep 17 00:00:00 2001
+From 024d2e2f36aa3bd5ba5bbf20c79eaf23f1c38c38 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
@@ -29,5 +29,5 @@ index ea3a9248..7b02226f 100644
          disconnect( "" );
      }
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 1e597d86bd5b0bb1fbd197fdc904097e6e96012f Mon Sep 17 00:00:00 2001
+From 9431bb550c8ad9e18872691d9043dac347bb0ac6 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 b09afd88..93a96bfd 100644
+index e3eaee39..89ca9c63 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
@@ -83,5 +83,5 @@ index 671cf96f..377df7ec 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
                  .remoteAddress( socketAddress )
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From b34e416dfd250b7d97c1ad1c810016203d9e53ab Mon Sep 17 00:00:00 2001
+From 248079a510a933343b7f52004e87a7c38170a5ed 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 e8d5ed19..00e03bae 100644
          if ( compressionThreshold < 0 )
          {
 -- 
-2.34.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 88834135061418ae8c007a335e2c0e5772f52ce5 Mon Sep 17 00:00:00 2001
+From 507a31bafc173948203073eed02cf798677e522e 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 6acbf7bf..05e3bd21 100644
          ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
          if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 5db60dbe715d4f186caee02e5cbbba4df5b23d90 Mon Sep 17 00:00:00 2001
+From adfd4ad0550d3830f1bf6baac86ad64f01f228e8 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.
@@ -170,7 +170,7 @@ index 59c104d3..698b420f 100644
              private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
  
 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 93a96bfd..5af9c3bb 100644
+index 89ca9c63..b35236f5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -664,10 +664,18 @@ public class BungeeCord extends ProxyServer
@@ -311,5 +311,5 @@ index ecd3b619..7094fe0b 100644
 +    // Waterfall end
  }
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 3dfc4797edcf7a603aa3e0c630cb5f8adacccbdf Mon Sep 17 00:00:00 2001
+From 3c8fdc59280303fcca5b51c9b78fc02a1886e716 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.42.0
+2.43.0
 

BungeeCord-Patches/0025-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From 18dec93180b89dc7f7bcda81cb5596ed53d38b33 Mon Sep 17 00:00:00 2001
+From 3955eb202eed2e2b2b49b8c403b0a72ad40f8f97 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
@@ -147,5 +147,5 @@ index 976c8e26..7e416a6d 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 78e1ea37862e6be4179f8477fbdb69ce36af6233 Mon Sep 17 00:00:00 2001
+From 05603a3876fcfa586dc6b9992b5e428f4a100de6 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
@@ -66,7 +66,7 @@ index 91743f01..111404fb 100644
      public int getTabThrottle() {
          return tabThrottle;
 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 5af9c3bb..166565a7 100644
+index b35236f5..06842eb1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -718,7 +718,7 @@ public class BungeeCord extends ProxyServer
@@ -79,5 +79,5 @@ index 5af9c3bb..166565a7 100644
  
      @Override
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 73b4887d23fc0825b270acba6cc26b3f68a31e98 Mon Sep 17 00:00:00 2001
+From f5cc5bc2d7be2deb3fef2eba5c4280ccd50e69f7 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
@@ -109,5 +109,5 @@ index 12bd18ed..f7160a66 100644
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 02d85afb1a967d4b744be4c31c4709e3d20fb0f1 Mon Sep 17 00:00:00 2001
+From 4af8c13703df60875533f0973f228ed8663e97fe 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 05898ba911116042aadf6c154f4f6c39b3234b36 Mon Sep 17 00:00:00 2001
+From 97625eccc25929d5d7d83f56648cebf15949af9c 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
@@ -53,5 +53,5 @@ index 250e7620..2207c3ff 100644
          {
              if ( slice != null )
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From d875a31567c80968074c822239555a0db45bbd6f Mon Sep 17 00:00:00 2001
+From 5e0d7a57b4e2576b25facd443f0a41d66c277418 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
@@ -216,5 +216,5 @@ index d15044f4..bea2bbff 100644
       * Sends the server mod list to the client, or stores it for sending later.
       *
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From fe8d22926e5d35ec817b333c8546f8ba527ead79 Mon Sep 17 00:00:00 2001
+From 8710865be33599b4d0212dcedd6587a601ac6d9d 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 c0a8ae4c..342551a6 100644
+index fe1506e4..18a5c526 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -34,6 +34,18 @@
@@ -175,5 +175,5 @@ index e0c52f21..37337429 100644
 +    // Waterfall End
  }
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From b82eb7c8e4f2c431657cf51961df1c9f67b426e0 Mon Sep 17 00:00:00 2001
+From fde062d7618ef25c070e9c58ddc83b122fb528ae 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 31f57df948a2fecc483cef4359d77e7c7e5e493d Mon Sep 17 00:00:00 2001
+From d6f4754d7bbbc92d84ccce081c3a62318a445ae4 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From ceefeced5e361ab808abd4831ce7ff9d45026855 Mon Sep 17 00:00:00 2001
+From 2ec957b0ea78ef67617a5c1c41ea13bf7a138443 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 07d49112..672a813d 100644
+index fc09cc11..7fbac761 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 a6684b7c..57ee7f23 100644
+index 3e08cb3c..0c04b87a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -55,12 +55,13 @@
@@ -253,7 +253,7 @@ index a6684b7c..57ee7f23 100644
      </modules>
  
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 342551a6..d3de9e34 100644
+index 18a5c526..9be9aa22 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -71,7 +71,7 @@
@@ -281,7 +281,7 @@ index 342551a6..d3de9e34 100644
              <groupId>net.sf.jopt-simple</groupId>
              <artifactId>jopt-simple</artifactId>
 @@ -130,6 +131,35 @@
-             <version>1.7.3</version>
+             <version>1.9.18</version>
              <scope>runtime</scope>
          </dependency>
 +        <!-- Waterfall start - Console improvements - bring back slf4j-->
@@ -362,7 +362,7 @@ index 00000000..765d24bc
 +
 +}
 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 166565a7..71bb3d9d 100644
+index 06842eb1..d60bdeb0 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -48,7 +48,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -1629,5 +1629,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From ee8508af13a1c8addcd54fb2fddb5e366541b252 Mon Sep 17 00:00:00 2001
+From 1761a7f440d7e4fab7ad1dcda8117fe27eed1a1c 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 0c79b259f553abdc617e0aa12b53f54d3e47a7d1 Mon Sep 17 00:00:00 2001
+From efedb4d256c3adada74d8ff5af2434c11e25840b 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
@@ -23,7 +23,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 1cc7936e..e83b2f21 100644
+index f9a169cc..6d20191e 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
 @@ -38,6 +38,24 @@
@@ -52,5 +52,5 @@ index 1cc7936e..e83b2f21 100644
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 27d38f7079c9069b6568d6d7042d8e2e1422afea Mon Sep 17 00:00:00 2001
+From 2dd371eeceaa3d8fe8adf4b1041cf31890042370 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 06e1719230949423936c9a395802628a77f09a76 Mon Sep 17 00:00:00 2001
+From 10d0cd9245b3f75c26efd0b594ec019cb95876d0 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From e03f7fe257e46bec92ba2a5f102a1b3bdef643f7 Mon Sep 17 00:00:00 2001
+From 1f305141c3b140348228142d4d450900021a083b 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
@@ -64,5 +64,5 @@ index 7b02226f..bc98b6b1 100644
  
      private void finish2()
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 754e416935ecdc215c4e049819bf1948c3d22eb1 Mon Sep 17 00:00:00 2001
+From 6bd04a3ed17d267336bf418a14f992d682c648d6 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
@@ -77,5 +77,5 @@ index bc98b6b1..460a79a1 100644
                  ch.setProtocol( Protocol.LOGIN );
  
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,11 +1,11 @@
-From 06d7c7b413033551477403e14189e9deb92641a5 Mon Sep 17 00:00:00 2001
+From ab57199fa438d9abf524c233e569350ec2cfc6e3 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 71bb3d9d..5cc308b8 100644
+index d60bdeb0..0646684f 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 7aae27e71a89d2753226c4f8340560fd06ab4db1 Mon Sep 17 00:00:00 2001
+From 075bc35b82064130e9b8b5919e62eb05c74fc778 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 776a0603..fa021598 100644
+index 2207c3ff..655bcd46 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
 @@ -45,6 +45,12 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -38,5 +38,5 @@ index 277e70e8..cf7dea17 100644
                      throw new CorruptedFrameException( "Empty Packet!" );
                  }
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 4510748e71ed701c4179156e3d3bf84226775558 Mon Sep 17 00:00:00 2001
+From 145c6a12317d0d9ec49a7902a461de1a178632f5 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 297166e5e56341bf459d16a96e7186d47813d4fb Mon Sep 17 00:00:00 2001
+From 30f946ce72014dcdcfe31aa7703a5d30b1e13d42 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

BungeeCord-Patches/0045-Add-ProxyDefineCommandsEvent.patch

@@ -1,4 +1,4 @@
-From c6a05be943e92d56c54992c78cffa425239ee361 Mon Sep 17 00:00:00 2001
+From 567777504ad1b5abb4388b7764945d9279c2f3b7 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
@@ -86,5 +86,5 @@ index 249c3f46..42232443 100644
                  CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
                          .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From c6f351aa810086f14135c2821ae060c54905fe0d Mon Sep 17 00:00:00 2001
+From b0e90afad7bbcfd7bf60bcf6c218014933e39693 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 0a62f3f1c21e3d233984a5c791a8f01edc3c4ecc Mon Sep 17 00:00:00 2001
+From bc847940495ff523e90196d7f6eaa7cfbed5e974 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From e34d073a76021f7595cd1ee98b4c149c75dd70b1 Mon Sep 17 00:00:00 2001
+From c403a8786903aaa9a99c791aba55fc66337f9abe 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
@@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644
  
              // Waterfall start
 -- 
-2.39.2
+2.43.0
 

BungeeCord-Patches/0049-ConnectionInitEvent.patch

@@ -1,4 +1,4 @@
-From 888d05f5fba61d8aa230eebe869bce7e5c19fe82 Mon Sep 17 00:00:00 2001
+From 25481b9d5076273cd88202d69c10da6ed9767f5a 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 533bf109a98bb35c3e982cfc7b2628dc59c6de23 Mon Sep 17 00:00:00 2001
+From 39ff4f7ba8fb95d22fad85120106e2fe7f87f815 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
@@ -695,5 +695,5 @@ index 38b75b51..02ec98fc 100644
  
              // If we have a period of 0 or less, only run once
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From d910c426ae5512d9ed992bbbcd57d62fb7926c88 Mon Sep 17 00:00:00 2001
+From b5665dfdc09e8f793fef67533e0b7bc77696e86f 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
@@ -71,5 +71,5 @@ index 42232443..747916d1 100644
  
      @Override
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 14356d7b7316920c047225d153d5abc5411792a1 Mon Sep 17 00:00:00 2001
+From 3ae80dc780d68cd1701951509a5e6b880e2f9943 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
@@ -18,5 +18,5 @@ index 747916d1..d0496ab4 100644
              brand.release();
              // changes in the packet are ignored so we need to send it manually
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 2c86c888764bec367f1ff2c240a41d132842733c Mon Sep 17 00:00:00 2001
+From c97c6f85ccca1dbf601500ee7b975788d7af7acc 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
@@ -27,5 +27,5 @@ index b0caf6d6..03608ef1 100644
          Callback<String> handler = new Callback<String>()
          {
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 371ddbcc82209081407cc1c3ed8af7a154ab6ce8 Mon Sep 17 00:00:00 2001
+From 745a896d569b83098283b675577e16baf2255c0a 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 9a0ea49743be5e1783cd701cda3757778bc198c5 Mon Sep 17 00:00:00 2001
+From d7ec1a5e11b1b0d806f2a0bdcf6a881064081651 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
@@ -257,5 +257,5 @@ index 738f0c92..ec33d337 100644
 +    // Waterfall end
  }
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 6f4f56effdd7fee9fb14aadbc893434ede4da78f Mon Sep 17 00:00:00 2001
+From 24d69fc033d978cadcc6b0ec63bf305f1b6353c3 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.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 5e1364060a35739c23d59c8e6276f28b874ea189 Mon Sep 17 00:00:00 2001
+From 0e6a3432cad31d9827ed3e35568e93239b951d89 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
@@ -101,5 +101,5 @@ index 03608ef1..97fcd106 100644
              }
          } else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
 -- 
-2.42.1
+2.43.0
 

BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch

@@ -1,4 +1,4 @@
-From 746b54287dd1ea4220b97894d61ce24d3cd65edf Mon Sep 17 00:00:00 2001
+From 04ddae3da84541c43f749b212babe1304c24a35f 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
@@ -90,5 +90,5 @@ index 1d3b7a9d..6c83039d 100644
                  }
              }
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From a00f92b9ec6d2073ae2e4abd426d65d971611907 Mon Sep 17 00:00:00 2001
+From ad63d355a4d87b0b203c82583e792c53dc82fc88 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
@@ -27,5 +27,5 @@ index 6c83039d..553680ee 100644
  
      @Override
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 071b75b6095cc6c21e8750ad48d74f514c756139 Mon Sep 17 00:00:00 2001
+From 9f02acf8b272fc63840c758087213c5d464abcf1 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
@@ -26,5 +26,5 @@ index 97fcd106..9c322fb5 100644
      }
  
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From b13c9df810ca47a2d64848f3b03f1048819df913 Mon Sep 17 00:00:00 2001
+From b53958447d57fd8bf97defa9550a0bd5577b086f 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
@@ -34,5 +34,5 @@ index b55ebede..27d4c2c4 100644
      }
  }
 -- 
-2.39.2
+2.43.0
 

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

@@ -1,11 +1,11 @@
-From b33f4ed8e030c9898156cfeb8db6be204ad4b962 Mon Sep 17 00:00:00 2001
+From 87bdfba145d386f2a2e023a3247cd9f98568d72e 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
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
-index fd840d28..053cc9eb 100644
+index 206f4227..954ffbc9 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
 @@ -152,6 +152,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@@ -24,5 +24,5 @@ index fd840d28..053cc9eb 100644
                      {
                          ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - corrupted frame: {1}", new Object[]
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From eca9314d27830f7af4300fca0330aee48324363b Mon Sep 17 00:00:00 2001
+From 17682183ba6a38abcf489250d5a1806a6b9c835d 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
@@ -32,5 +32,5 @@ index e42b798b..76ad621f 100644
  error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
  error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From caf1fb139eb3ba9276f69084da78e2e79758e6e5 Mon Sep 17 00:00:00 2001
+From 7a1be158a495b23c3d4e77f29dfb72daca03aa10 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.
@@ -142,5 +142,5 @@ index af65e192..6a045d16 100644
      {
          return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 7c72b4ab1fd8611e97307dfac87f275187253a45 Mon Sep 17 00:00:00 2001
+From d3343b033840d723bfc103fca04c04cb2975c412 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
@@ -28,5 +28,5 @@ index a9358a51..5e74d0e2 100644
  
      @Override
 -- 
-2.42.1
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 87ff91f098c8cc5f1f6cbba5f4724552b3c8805c Mon Sep 17 00:00:00 2001
+From 674e934b2caa424135b34c4b246962f8767a4009 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
@@ -125,5 +125,5 @@ index 05e3bd21..dff5e283 100644
          }
          throw CancelSendSignal.INSTANCE;
 -- 
-2.39.2
+2.43.0