Updated Upstream (BungeeCord) (#695)

Upstream has released updates that appears 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:
6613aaea Add test fix for library classes being visible to non-dependent plugins
53ce6b93 #3200: Fix protocol for 21w40a
d8e29384 #2466: Use switch in "BungeeCord" plugin message handling
5cf869df #3198: Remove terminally deprecated SecurityManager
f26f7d88 Add optional 1.18 (21w40a) snapshot protocol support

BungeeCord

@@ -1 +1 @@
-Subproject commit c5a90475afba676c96d33fc3c7a3c06490b5d13b
+Subproject commit 6613aaea95f4894ea19c31e0d564d45fcf43456f

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

@@ -1,4 +1,4 @@
-From b0de2554f0190d95e95741474113e9665c7bbdfd Mon Sep 17 00:00:00 2001
+From 42faba74464b079a46f3c6703f3d189206fa2b23 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 f80c0486..998316c3 100644
+index c3bb3afa..ee4d5282 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -187,7 +187,7 @@ public class BungeeCord extends ProxyServer
@@ -28,9 +28,9 @@ index f80c0486..998316c3 100644
 -        Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use BungeeCord in directory with ! in path." );
 +        Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
  
-         System.setSecurityManager( new BungeeSecurityManager() );
- 
-@@ -530,7 +530,7 @@ public class BungeeCord extends ProxyServer
+         try
+         {
+@@ -528,7 +528,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {
@@ -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 c0620445..e65558ad 100644
+index 2691b8b8..8c25b711 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 c0620445..e65558ad 100644
              SocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.31.1.windows.1
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0005-Disable-Metrics.patch

@@ -1,4 +1,4 @@
-From 667ad1f7ae23c9bb8010653312c5c6dba5c64823 Mon Sep 17 00:00:00 2001
+From 89153d0b39356124f0a3fd4dec5a4fbf525caf93 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 f8f3fb44..16d4e433 100644
+index 582be876..dddc14d8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -123,7 +123,7 @@ public class BungeeCord extends ProxyServer
@@ -18,7 +18,7 @@ index f8f3fb44..16d4e433 100644
      /**
       * Server socket listener.
       */
-@@ -304,7 +304,7 @@ public class BungeeCord extends ProxyServer
+@@ -302,7 +302,7 @@ public class BungeeCord extends ProxyServer
                  }
              }
          }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@@ -27,7 +27,7 @@ index f8f3fb44..16d4e433 100644
  
          Runtime.getRuntime().addShutdownHook( new Thread()
          {
-@@ -462,7 +462,7 @@ public class BungeeCord extends ProxyServer
+@@ -460,7 +460,7 @@ public class BungeeCord extends ProxyServer
              reconnectHandler.close();
          }
          saveThread.cancel();
@@ -177,5 +177,5 @@ index eabf7573..00000000
 -    }
 -}
 -- 
-2.31.1
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,14 +1,14 @@
-From 4026d8133ccba5176f53f6e9ff695911e17fa508 Mon Sep 17 00:00:00 2001
+From f980f4a08f5573e1b46a288710ecea8c29f01e7e 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 ce9e5298..caf7ed0b 100644
+index b040b1d4..bb37ba04 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
-@@ -95,6 +95,16 @@ public class ProtocolConstants
+@@ -96,6 +96,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
  
@@ -26,5 +26,5 @@ index ce9e5298..caf7ed0b 100644
      {
  
 -- 
-2.28.0.windows.1
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch

@@ -1,107 +0,0 @@
-From 6263c6b63509c82ce47e619b02513b50cd5baa11 Mon Sep 17 00:00:00 2001
-From: Tux <write@imaginarycode.com>
-Date: Mon, 25 Jan 2016 01:19:07 -0500
-Subject: [PATCH] Get rid of the security manager.
-
-There's a lot of opinions running on both sides of the debate, but we overwhelmingly feel that the security manager does not help the vast majority of BungeeCord users or plugin developers create correct code.
-
-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 16d4e433..8464fefb 100644
---- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -190,8 +190,6 @@ public class BungeeCord extends ProxyServer
-         // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
-         Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
- 
--        System.setSecurityManager( new BungeeSecurityManager() );
--
-         try
-         {
-             baseBundle = ResourceBundle.getBundle( "messages" );
-diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeSecurityManager.java b/proxy/src/main/java/net/md_5/bungee/BungeeSecurityManager.java
-deleted file mode 100644
-index 53c81923..00000000
---- a/proxy/src/main/java/net/md_5/bungee/BungeeSecurityManager.java
-+++ /dev/null
-@@ -1,78 +0,0 @@
--package net.md_5.bungee;
--
--import java.io.PrintWriter;
--import java.io.StringWriter;
--import java.security.AccessControlException;
--import java.security.Permission;
--import java.util.HashSet;
--import java.util.Set;
--import java.util.logging.Level;
--import net.md_5.bungee.api.ProxyServer;
--import net.md_5.bungee.api.scheduler.GroupedThreadFactory;
--
--public class BungeeSecurityManager extends SecurityManager
--{
--
--    private static final boolean ENFORCE = false;
--    private final Set<String> seen = new HashSet<>();
--
--    private void checkRestricted(String text)
--    {
--        Class[] context = getClassContext();
--        for ( int i = 2; i < context.length; i++ )
--        {
--            ClassLoader loader = context[i].getClassLoader();
--
--            // Bungee / system can do everything
--            if ( loader == ClassLoader.getSystemClassLoader() || loader == null )
--            {
--                break;
--            }
--
--            AccessControlException ex = new AccessControlException( "Plugin violation: " + text );
--            if ( ENFORCE )
--            {
--                throw ex;
--            }
--
--            StringWriter stack = new StringWriter();
--            ex.printStackTrace( new PrintWriter( stack ) );
--            if ( seen.add( stack.toString() ) )
--            {
--                ProxyServer.getInstance().getLogger().log( Level.WARNING, "Plugin performed restricted action, please inform them to use proper API methods: " + text, ex );
--            }
--            break;
--        }
--    }
--
--    @Override
--    public void checkExit(int status)
--    {
--        checkRestricted( "Exit: Cannot close VM" );
--    }
--
--    @Override
--    public void checkAccess(ThreadGroup g)
--    {
--        if ( !( g instanceof GroupedThreadFactory.BungeeGroup ) )
--        {
--            checkRestricted( "Illegal thread group access" );
--        }
--    }
--
--    @Override
--    public void checkPermission(Permission perm, Object context)
--    {
--        checkPermission( perm );
--    }
--
--    @Override
--    public void checkPermission(Permission perm)
--    {
--        switch ( perm.getName() )
--        {
--            case "setSecurityManager":
--                throw new AccessControlException( "Restricted Action", perm );
--        }
--    }
--}
--- 
-2.31.1
-

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

@@ -1,4 +1,4 @@
-From 2ccf865f350de60caee4370d653329f31b75cd1a Mon Sep 17 00:00:00 2001
+From 0cf87c789c24e97cbadb74d50597c15d85006b26 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 96d0a71d..bac6b1b0 100644
+index 596ced71..b91981e6 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 96d0a71d..bac6b1b0 100644
      @Override
      public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
 -- 
-2.19.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From deeb66432761cb3ae27be58738fcb01e5a727f29 Mon Sep 17 00:00:00 2001
+From 1a5e92a62801a3c7ee5093b73ae1d963579b8472 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't access a ByteBuf's underlying array
 It returns the underlying array storage, and does *not* return a view of the buffer as an array
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
-index c01cf317..17e12655 100644
+index af16ead8..c652ffb4 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
 @@ -4,6 +4,7 @@ import com.google.common.base.Function;
@@ -43,7 +43,7 @@ index c01cf317..17e12655 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 a87585fb..795ba6b6 100644
+index 7b705d99..b4661cfb 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
@@ -56,10 +56,10 @@ index a87585fb..795ba6b6 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 4c03bfb2..552b0b17 100644
+index 075676e7..abad8e3d 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
-@@ -268,7 +268,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -269,7 +269,7 @@ public class DownstreamBridge extends PacketHandler
  
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@@ -86,5 +86,5 @@ index 1533eadc..a715ec8a 100644
      {
          @Override
 -- 
-2.31.1.windows.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 8fe7d7d99ecdfa342b7cfb5bfca9f4f61bb2be37 Mon Sep 17 00:00:00 2001
+From 45fdbf7edc81e2610a939e208d4cdd7570792cf9 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
@@ -264,5 +264,5 @@ index cc40fe1b..25406d82 100644
  
      @Override
 -- 
-2.30.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 5b984fcf1ad62ff4f57218bf4e79fc4458ee6633 Mon Sep 17 00:00:00 2001
+From 9ae310722ce5ad06451042bd7eb7a47a8cd19403 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
@@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
 No breaking changes occur due to this patch.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 795ba6b6..2762aede 100644
+index b4661cfb..1f4cd068 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf;

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

@@ -1,11 +1,11 @@
-From 914e63b8024182183a313a03f1d72b4bd8bd3681 Mon Sep 17 00:00:00 2001
+From 1ea8b846f0c0dab4d0a9d526e8bf7052fc3b8bdc 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 23fa3024..c4a7ee5e 100644
+index 20c62f1d..e8d65a54 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
 @@ -450,6 +450,26 @@ public class ComponentsTest
@@ -53,5 +53,5 @@ index 9e37eed0..a25a01b8 100644
 +    }
  }
 -- 
-2.25.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 08bece5292489452ccba95c8847398db189d9a11 Mon Sep 17 00:00:00 2001
+From f4a19cd3877f948c0dabd916d161fc89eb88b706 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 56a0f29c..d640313a 100644
  
          for ( ListenerInfo listener : listeners )
 -- 
-2.25.0
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch

@@ -1,4 +1,4 @@
-From 304688eed40e4e7eaa6ba2474286972b5651b2bf Mon Sep 17 00:00:00 2001
+From 836f3e6c00be5148e946b11ed2fa9eb7e2bb1483 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.
@@ -6,7 +6,7 @@ Subject: [PATCH] Enable TCP_NODELAY.
 This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index c0f7980b..8969a5ed 100644
+index a715ec8a..abc60316 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 @@ -169,6 +169,7 @@ public class PipelineUtils
@@ -18,5 +18,5 @@ index c0f7980b..8969a5ed 100644
              ch.config().setWriteBufferWaterMark( MARK );
  
 -- 
-2.25.0
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0015-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From 38cac6bb66605dd7c39c7a1c0c7eba5ad25a43a7 Mon Sep 17 00:00:00 2001
+From d30c8c138f1e6d73fbe4bc586b1bd523a45a7ae7 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,7 +8,7 @@ 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/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index 8464fefb..a1752045 100644
+index dddc14d8..7227f268 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -559,7 +559,9 @@ public class BungeeCord extends ProxyServer
@@ -23,18 +23,18 @@ index 8464fefb..a1752045 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 552b0b17..a859195e 100644
+index abad8e3d..d9facc62 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
-@@ -250,7 +250,6 @@ public class DownstreamBridge extends PacketHandler
-     @Override
+@@ -251,7 +251,6 @@ public class DownstreamBridge extends PacketHandler
+     @SuppressWarnings("checkstyle:avoidnestedblocks")
      public void handle(PluginMessage pluginMessage) throws Exception
      {
 -        DataInput in = pluginMessage.getStream();
          PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
  
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -277,6 +276,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -278,6 +277,7 @@ public class DownstreamBridge extends PacketHandler
  
          if ( pluginMessage.getTag().equals( "BungeeCord" ) )
          {
@@ -43,5 +43,5 @@ index 552b0b17..a859195e 100644
              String subChannel = in.readUTF();
  
 -- 
-2.31.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 649161b8c66503d01ca6601d110e5209d068582e Mon Sep 17 00:00:00 2001
+From d3adc851b7f3a6c361612b477805af38a5ce4b53 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
@@ -37,10 +37,10 @@ index d36b7f3c..5e03e175 100644
              {
                  packet.read( in, 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 f29355bb..1cec1657 100644
+index 9c8a7118..220365dd 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
-@@ -518,14 +518,23 @@ public enum Protocol
+@@ -522,14 +522,23 @@ public enum Protocol
              return protocol;
          }
  
@@ -66,7 +66,7 @@ index f29355bb..1cec1657 100644
                  throw new BadPacketException( "Packet with id " + id + " outside of range" );
              }
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 2762aede..a8516462 100644
+index 1f4cd068..152a2b65 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -32,7 +32,9 @@ import net.md_5.bungee.forge.ForgeUtils;
@@ -105,10 +105,10 @@ index 8979ac22..d4348eb7 100644
      @Getter
      @NonNull
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index 3f18393f..572e1c47 100644
+index 23715f68..7d970ad8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-@@ -325,6 +325,12 @@ public abstract class EntityMap
+@@ -327,6 +327,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
  
@@ -122,5 +122,5 @@ index 3f18393f..572e1c47 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.28.0.windows.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,11 +1,11 @@
-From bc43bcb3f3d2366bf219df39d735a89622a6b620 Mon Sep 17 00:00:00 2001
+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 0874544f..7d7e5a7f 100644
+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
@@ -43,5 +43,5 @@ index 0874544f..7d7e5a7f 100644
  
      private long lastPing;
 -- 
-2.25.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 97ce610bc985469be5007a543fc1f49eab49478d Mon Sep 17 00:00:00 2001
+From 78af2898f522c9819132e8fac9bed8d067a61b01 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 41101a6e..4ed24626 100644
  
          if ( tabComplete.getCursor().startsWith( "/" ) )
 -- 
-2.30.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 81b84d57826eaa631e1f58fc6dc4b52f440582ff Mon Sep 17 00:00:00 2001
+From 23c179769cebc81eaeccc4774e26e9e92f777996 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 a8516462..4c45c102 100644
+index 152a2b65..6d5c4255 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -451,6 +451,6 @@ public class ServerConnector extends PacketHandler
@@ -19,10 +19,10 @@ index a8516462..4c45c102 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 a859195e..b9783a4c 100644
+index d9facc62..dd742d01 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
-@@ -654,6 +654,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -674,6 +674,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -31,7 +31,7 @@ index a859195e..b9783a4c 100644
      }
  }
 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 3eeaeffb..8ee21e14 100644
+index 25406d82..646e07f4 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
 @@ -647,20 +647,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -57,7 +57,7 @@ index 3eeaeffb..8ee21e14 100644
  
      @Override
 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 f88831f7..a667623b 100644
+index 4ed24626..30623743 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
 @@ -284,6 +284,6 @@ public class UpstreamBridge extends PacketHandler
@@ -69,5 +69,5 @@ index f88831f7..a667623b 100644
      }
  }
 -- 
-2.32.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From e8c78624b7d41a8d5a330a0f7c57d257674dd598 Mon Sep 17 00:00:00 2001
+From 34b679a4c08490fe3aebd16be3fde4510c760e46 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 646e07f4..d823a718 100644
          disconnect( "" );
      }
 -- 
-2.30.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From a4f2f8f88907fb0652ef6f9585fa221f45d04e25 Mon Sep 17 00:00:00 2001
+From 149622abd47e5819a8f986288c13b8f5e539f7b5 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 a1752045..7c19832f 100644
+index 7227f268..edb173d1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -118,7 +118,7 @@ public class BungeeCord extends ProxyServer
@@ -83,5 +83,5 @@ index 9d581d9a..7b002089 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
                  .remoteAddress( socketAddress )
 -- 
-2.31.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 7533aa6de4430f84ea6bb8deb1b1ae4a23d02a70 Mon Sep 17 00:00:00 2001
+From 308ef44c07acd33e80920f2134af7472d0221f4b 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

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

@@ -1,4 +1,4 @@
-From af3a8405d14875f22734055be358e8f895da72b9 Mon Sep 17 00:00:00 2001
+From eb08195f059ee1135c1eee1bc86089a83b6d2f95 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
@@ -29,5 +29,5 @@ index 30623743..c769976f 100644
          ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
          if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
 -- 
-2.30.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From f1d3445b11e8ebb0eec708d50155484086c89114 Mon Sep 17 00:00:00 2001
+From 2f052d8ead2ce37041ede5dd409cf66a940d1a8e 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 7c19832f..99636fb4 100644
+index edb173d1..7d08b164 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -635,10 +635,18 @@ public class BungeeCord extends ProxyServer
@@ -311,5 +311,5 @@ index d640313a..115f614e 100644
 +    // Waterfall end
  }
 -- 
-2.31.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From e86cf467adab61a44534cc9ece28770989a5e1c4 Mon Sep 17 00:00:00 2001
+From fac41e3a38b4f6285700c2527da3e9bbbdb5087e 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.26.1
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0026-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From c6c1164448a67e3b72752fc638f1033137571264 Mon Sep 17 00:00:00 2001
+From 6cd968fe423be552cb5044f6c147f732c27d6416 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 4c45c102..84e93b38 100644
+index 6d5c4255..9b44f6a5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -368,7 +368,7 @@ public class ServerConnector extends PacketHandler
@@ -75,7 +75,7 @@ index 4c45c102..84e93b38 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 b9783a4c..757a595b 100644
+index dd742d01..314b08bc 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
 @@ -12,6 +12,7 @@ import com.mojang.brigadier.context.StringRange;
@@ -132,7 +132,7 @@ index b9783a4c..757a595b 100644
          }
  
          ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -538,7 +554,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -558,7 +574,11 @@ public class DownstreamBridge extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@@ -146,5 +146,5 @@ index b9783a4c..757a595b 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.31.1.windows.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 412c2a4b879a3efbd8eab0cc66345f8a3146dcc0 Mon Sep 17 00:00:00 2001
+From d8edfd4f25297caf0e989e55fe987bb86bc47c36 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 99636fb4..1f6ba085 100644
+index 7d08b164..1db22fc6 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -689,7 +689,7 @@ public class BungeeCord extends ProxyServer
@@ -79,5 +79,5 @@ index 99636fb4..1f6ba085 100644
  
      @Override
 -- 
-2.31.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From c730e09faaa438333ef13935f08a44097f947562 Mon Sep 17 00:00:00 2001
+From b741851e074a7f9a5233932c3320b6e616bc61ad 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 29a4716f..3dc32801 100644
+index e7ab62e5..684eb883 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

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

@@ -1,4 +1,4 @@
-From 05394782ec180a43a827538f0dee0ae705dec2c2 Mon Sep 17 00:00:00 2001
+From dad0bc898469685c8de63dd5fba41e50d048da34 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.26.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 5622d256e0495063202405cc950979edbd464bde Mon Sep 17 00:00:00 2001
+From a74bf9b63a72510f15b4a3aec96d28209348538b 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 5e03e175..961887c9 100644
          {
              if ( slice != null )
 -- 
-2.25.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 307d071abd19cfe07b7bb9f90bac7ca9b24737fd Mon Sep 17 00:00:00 2001
+From abf53bfc51be02b7d0dc498174a7f78a58be28a2 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
@@ -33,7 +33,7 @@ index 15a61b7e..ee2317e8 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 1cec1657..e95431a0 100644
+index 220365dd..7f0b71c9 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
 @@ -18,6 +18,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
@@ -66,7 +66,7 @@ index 1cec1657..e95431a0 100644
              TO_CLIENT.registerPacket(
                      PlayerListItem.class, // PlayerInfo
                      PlayerListItem::new,
-@@ -567,10 +583,11 @@ public enum Protocol
+@@ -571,10 +587,11 @@ public enum Protocol
                          mappingIndex++;
                      }
                  }
@@ -198,7 +198,7 @@ index a8f4378e..95dc97b9 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 757a595b..033877fc 100644
+index 314b08bc..b205cc0f 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
 @@ -52,6 +52,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
@@ -210,7 +210,7 @@ index 757a595b..033877fc 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;
-@@ -639,6 +641,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -659,6 +661,32 @@ public class DownstreamBridge extends PacketHandler
          }
      }
  

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

@@ -1,4 +1,4 @@
-From d1bbde9308d3535bd830daf15e230b03a121e043 Mon Sep 17 00:00:00 2001
+From 877cbb5ce3cc8190f8bd2c0378cdca0f6ba54d48 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 f5610a53..31e172c7 100644
+index 0cd347d8..526617e0 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -36,6 +36,20 @@
@@ -177,5 +177,5 @@ index e0c52f21..37337429 100644
 +    // Waterfall End
  }
 -- 
-2.31.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 9ba3389a4e980189ec76dcea48c7f03e2c5212a5 Mon Sep 17 00:00:00 2001
+From 114cbbfd6c824adc67afa2150ff5e943a2049ac2 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
@@ -22,5 +22,5 @@ index 39fc55f9..c2512dd5 100644
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
              }
 -- 
-2.31.1.windows.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From defb97c98d4a9bd73b90ca1d4ac4feaf91bbf40d Mon Sep 17 00:00:00 2001
+From 71d876da0ca5d9b2c2a17f04dad395c80d22fcdc 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.26.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 76cf77bc9f761dce7d6fe2eaf8040ddce503b2cd Mon Sep 17 00:00:00 2001
+From da87484b20ad60b476c39f1364f169872b9f6d3e 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
@@ -233,7 +233,7 @@ index 00000000..93ce3b14
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 97056e93..e92d5af8 100644
+index 85e74737..8d86e36c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,11 +56,12 @@
@@ -1585,5 +1585,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.32.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From bc19d3966f696f76fe17a68f4bd2ce1a4de66a96 Mon Sep 17 00:00:00 2001
+From 4615cb1e2f3ac72e57bf5d208ada42faf5fb83ce 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 93ce3b14..3b3525f0 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.26.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From c2a00dbdee271905c3553c2a733e6e8ee584b541 Mon Sep 17 00:00:00 2001
+From 6e9c3003661a15191c022fab3c1949e927d32216 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
@@ -56,5 +56,5 @@ index d5ad0f87..7ec6e530 100644
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.32.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 490f4b325aec7ae8f93dc463cc199be99795ce05 Mon Sep 17 00:00:00 2001
+From 3d6b47a2d059f408afdcd3e65c60ba6a127a2e4b 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.26.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 581a41cd927ceea9cc783770ef6ea38864e5cffc Mon Sep 17 00:00:00 2001
+From 43359298fc34770dcd63045ccff96b55630dfa4b 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.31.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 079fd1ed11ba7b5c9509fd0c614f8bd3160b4140 Mon Sep 17 00:00:00 2001
+From 381e769107baef7b50d6d793177272b8e94d549f 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 938fa31c..6c4f57eb 100644
+index d823a718..3c2dc475 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
 @@ -555,7 +555,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -65,5 +65,5 @@ index 938fa31c..6c4f57eb 100644
  
      @Override
 -- 
-2.32.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 3f84278d29527968ca4b78a1a299a7c825910390 Mon Sep 17 00:00:00 2001
+From 09bfed1385492691961f84e2c1ad9550601716b2 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 3c2dc475..80a66a2b 100644
                  ch.setProtocol( Protocol.LOGIN );
  
 -- 
-2.30.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,11 +1,11 @@
-From be8460146ca653b8887f7010630a4c34852bbc21 Mon Sep 17 00:00:00 2001
+From 8a58eb07a988a46d9f444d67484842b58d38917a 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 617a077f..eeb63c43 100644
+index f281dfa1..c5f2a92d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -281,8 +281,6 @@ public class BungeeCord extends ProxyServer
@@ -31,5 +31,5 @@ index 115f614e..85d2197a 100644
      @Synchronized("serversLock") // Waterfall
      public void load()
 -- 
-2.31.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 6ec81191c882a0728141740b9f61b6162ddb6907 Mon Sep 17 00:00:00 2001
+From 3edeced9d513fbec1cbcc5cb8600907633e23b68 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
@@ -38,5 +38,5 @@ index 647394ba..f297620c 100644
                      throw new CorruptedFrameException( "Empty Packet!" );
                  }
 -- 
-2.31.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From d0addd4231eb0c95f4b8dcecce83a6d739667003 Mon Sep 17 00:00:00 2001
+From 8610fad68f5719f52367f7f2067fde61b2c806c8 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
@@ -67,5 +67,5 @@ index f297620c..c0d37142 100644
              }
          }
 -- 
-2.25.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 8bc317f3d6b8ef341fc3bd129bd78c80f371c629 Mon Sep 17 00:00:00 2001
+From 38e0957a49bfe1731d9b2373b8088629b0e8190f 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 84e93b38..a5efb0af 100644
+index 9b44f6a5..134d4356 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -231,7 +231,7 @@ public class ServerConnector extends PacketHandler
@@ -109,7 +109,7 @@ index 84e93b38..a5efb0af 100644
 +                }
 +
 +                Login modLogin = new Login( login.getEntityId(), login.isHardcore(), login.getGameMode(), login.getPreviousGameMode(), login.getWorldNames(), login.getDimensions(), login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(),
-+                        (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat() );
++                        (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat() );
 +                user.unsafe().sendPacket(modLogin);
 +
 +                // Only send if we're in the same dimension
@@ -138,10 +138,10 @@ index 95dc97b9..fc98b4b1 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 033877fc..72b6e9be 100644
+index b205cc0f..9f7dd038 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
-@@ -645,6 +645,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -665,6 +665,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(EntityEffect entityEffect) throws Exception
      {
@@ -149,7 +149,7 @@ index 033877fc..72b6e9be 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()) {
-@@ -656,6 +657,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -676,6 +677,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(EntityRemoveEffect removeEffect) throws Exception
      {
@@ -158,7 +158,7 @@ index 033877fc..72b6e9be 100644
      }
  
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index 572e1c47..09df5a93 100644
+index 7d970ad8..99ad8b9c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 @@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufInputStream;
@@ -181,7 +181,7 @@ index 572e1c47..09df5a93 100644
          switch ( version )
          {
              case ProtocolConstants.MINECRAFT_1_8:
-@@ -287,7 +293,13 @@ public abstract class EntityMap
+@@ -289,7 +295,13 @@ public abstract class EntityMap
                      DefinedPacket.readVarInt( packet );
                      break;
                  default:
@@ -234,5 +234,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.28.0.windows.1
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0046-Add-ProxyDefineCommandsEvent.patch

@@ -1,4 +1,4 @@
-From f36d1c7e29ee37a364a530794c674bdab826e774 Mon Sep 17 00:00:00 2001
+From b5bfb337c5c2ecd316ecdac721be5767e7ab3aac 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 72b6e9be..ace177ba 100644
+index 9f7dd038..4c70fc90 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
 @@ -12,7 +12,8 @@ import com.mojang.brigadier.context.StringRange;
@@ -78,7 +78,7 @@ index 72b6e9be..ace177ba 100644
  import lombok.RequiredArgsConstructor;
  import net.md_5.bungee.ServerConnection;
  import net.md_5.bungee.ServerConnection.KeepAliveData;
-@@ -680,9 +683,25 @@ public class DownstreamBridge extends PacketHandler
+@@ -700,9 +703,25 @@ public class DownstreamBridge extends PacketHandler
      {
          boolean modified = false;
  
@@ -107,5 +107,5 @@ index 72b6e9be..ace177ba 100644
                  LiteralCommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() )
                          .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
 -- 
-2.28.0
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0047-Use-proper-max-length-for-serverbound-chat-packet.patch

@@ -1,11 +1,11 @@
-From 642d3af7c2e2537c49af02090b2ff7f17424c5e9 Mon Sep 17 00:00:00 2001
+From a8361371f69b268c3b3b29d5460a92ed56d99eca Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:39:12 -0700
 Subject: [PATCH] Use proper max length for serverbound chat packet
 
 
 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 0cef9430..d51a3142 100644
+index 8b2a2822..ab9519f9 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
 @@ -56,6 +56,20 @@ public abstract class DefinedPacket
@@ -30,7 +30,7 @@ index 0cef9430..d51a3142 100644
      {
          if ( b.length > Short.MAX_VALUE )
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
-index e3a4d250..4749a671 100644
+index 11b04c2a..6034fc18 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
 @@ -54,6 +54,11 @@ public class Chat extends DefinedPacket
@@ -46,5 +46,5 @@ index e3a4d250..4749a671 100644
          if ( direction == ProtocolConstants.Direction.TO_CLIENT )
          {
 -- 
-2.31.1.windows.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From e59ea6c7f36d92f1e7eef0afcf6f91f6e92735df Mon Sep 17 00:00:00 2001
+From 8789a416b075862da97e7348e9b6583666ced815 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.26.1
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 0a8ceb281a8162b0de4887b2569995bba6f0d41f Mon Sep 17 00:00:00 2001
+From 66e5a2d53c7935418cda69ab06874731831a266b 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.32.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 21d5f3c16dbc4a10e89e8a5d3eb2df5342711eb7 Mon Sep 17 00:00:00 2001
+From 4bd6ac47556d016ac1415c4d929107b8b7040f9b 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.30.0
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0051-ConnectionInitEvent.patch

@@ -1,4 +1,4 @@
-From 285774285d044a7087b12f67b7c225d35c6556ac Mon Sep 17 00:00:00 2001
+From f356c6e79ebca197af27f7dacda9410dea3117d1 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 abc60316..96704d5e 100644
      };
      public static final Base BASE = new Base();
 -- 
-2.32.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 9c03fe60c1742e26bb2294355279ee21c76ad643 Mon Sep 17 00:00:00 2001
+From 21a3747bc5c6ad81d8f3d0b4ea235360767af1e2 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.30.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 56cb3c65d1f2e5f10b5b635bf49f12b9fb849f76 Mon Sep 17 00:00:00 2001
+From a925d96a2e97f8523665c76e57b2a2c6e0dddc4f 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,7 +50,7 @@ index e860214f..527f310e 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 ace177ba..f4494898 100644
+index 4c70fc90..ef6214b1 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
 @@ -162,8 +162,14 @@ public class DownstreamBridge extends PacketHandler
@@ -71,5 +71,5 @@ index ace177ba..f4494898 100644
  
      @Override
 -- 
-2.32.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,14 +1,14 @@
-From 8cc29367cfb4d1b64df8774113a779fa0b03e504 Mon Sep 17 00:00:00 2001
+From a61ec46ee3caa4bd08da67acc4bc62a19541d7a2 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 f4494898..9e180c30 100644
+index ef6214b1..d3650ff8 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
              Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" );
  
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
@@ -18,5 +18,5 @@ index f4494898..9e180c30 100644
              brand.release();
              // changes in the packet are ignored so we need to send it manually
 -- 
-2.32.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From a36b335d307fd14a3694937fd0bc1c4b53ec0d1d Mon Sep 17 00:00:00 2001
+From 1da5defd28c4fad2c5b3448ea8ab4752ce2b4431 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 d07f60c9..0fd58e83 100644
          Callback<String> handler = new Callback<String>()
          {
 -- 
-2.30.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 29461b7407dbe62ed50a90fd0f8fc3dbe4443ca8 Mon Sep 17 00:00:00 2001
+From 8354e44c10d3e1a46b0fba7e5c38d10743b2580c 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.32.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 3407db483797e0b3ccca1c81773a97851cf22317 Mon Sep 17 00:00:00 2001
+From 56a334d52b88a16b48046f8a4fcc8d69bb17387d 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
@@ -241,5 +241,5 @@ index 738f0c92..ec33d337 100644
 +    // Waterfall end
  }
 -- 
-2.30.0
+2.30.1 (Apple Git-130)
 

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

@@ -1,4 +1,4 @@
-From 5e209c23e70b72cf2828a16ea042545daba9c382 Mon Sep 17 00:00:00 2001
+From 1156e7cb85a6b72eab3b9fcea8a139d7440ce4e2 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.32.0
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0059-Don-t-bother-locking-to-fetch-a-v4-UUID-from-the-off.patch

@@ -1,4 +1,4 @@
-From 5deaeab7db1364d5ff2125d569af60c3e90072c2 Mon Sep 17 00:00:00 2001
+From fc0f551fca8e045d1f1b4ade8c4358b0215abbb9 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 9 Jul 2021 13:20:36 +0100
 Subject: [PATCH] Don't bother locking to fetch a v4 UUID from the offline
@@ -22,5 +22,5 @@ index c7b0ab25..07d74c67 100644
          try
          {
 -- 
-2.32.0
+2.30.1 (Apple Git-130)
 

BungeeCord-Patches/0060-Strip-hostname-from-InetSocketAddress.patch

@@ -1,4 +1,4 @@
-From 4719d808999eabefc957768b47dfbf3faf962852 Mon Sep 17 00:00:00 2001
+From b19515dd32b044235453e6e2f4342b6513ca81b1 Mon Sep 17 00:00:00 2001
 From: mibac138 <5672750+mibac138@users.noreply.github.com>
 Date: Tue, 20 Jul 2021 00:47:59 +0200
 Subject: [PATCH] Strip hostname from InetSocketAddress
@@ -51,5 +51,5 @@ index 03dabe01..464acc6c 100644
          // Remove IPv6 scope if present
          if ( addr.getAddress() instanceof Inet6Address )
 -- 
-2.33.0
+2.30.1 (Apple Git-130)