Updated Upstream (BungeeCord)

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: a64c34d2 #2875: Add the MessageRaw channel 1d40b8a8 #2866: Add support for contents in Hover Event
2024-12-26 18:47:43 +01:00 · 2020-07-01 10:39:43 +01:00 · 2020-07-01 10:39:43 +01:00 · 8fb8b6cd2c
commit 8fb8b6cd2c
parent d2dc905447
20 changed files with 96 additions and 96 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 26f538d193e107f9e52a38fd05c3190c5852a05c
+Subproject commit a64c34d29e74afa97500bd41d4a836af5ed30ddf
--- a/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch
+++ b/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch
@ -1,4 +1,4 @@
-From edb7058f49ff52c35a441e70541ea5d2a57d80b3 Mon Sep 17 00:00:00 2001
+From ffb65e34665a6850d6fad13f5df3d5281759d7d8 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,10 +18,10 @@ 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 be5bd490..2929de8d 100644
+index c04c3e8e..b18d4854 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
+@@ -186,7 +186,7 @@ public class BungeeCord extends ProxyServer
     public BungeeCord() throws IOException
     {
         // 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.
@ -30,7 +30,7 @@ index be5bd490..2929de8d 100644
 
         System.setSecurityManager( new BungeeSecurityManager() );
 
-@@ -529,7 +529,7 @@ public class BungeeCord extends ProxyServer
+@@ -528,7 +528,7 @@ public class BungeeCord extends ProxyServer
     @Override
     public String getName()
     {
@ -101,5 +101,5 @@ index c0620445..e65558ad 100644
             SocketAddress address = Util.getAddr( addr );
             ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.25.0
+2.27.0

--- a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
+++ b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
@ -1,4 +1,4 @@
-From b81c7f82796229f0b7cd6d7f28ec72e6cbad64f7 Mon Sep 17 00:00:00 2001
+From fdd8855b8ca5c05d5a43b5a51888139a6c086911 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
@ -42,7 +42,7 @@ index 00000000..741ebfde
 +
 +}
 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 2929de8d..6dde4c84 100644
+index b18d4854..c1c0f227 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -10,6 +10,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -53,7 +53,7 @@ index 2929de8d..6dde4c84 100644
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelException;
-@@ -111,7 +112,7 @@ public class BungeeCord extends ProxyServer
+@@ -110,7 +111,7 @@ public class BungeeCord extends ProxyServer
      * Configuration.
      */
     @Getter
@ -118,5 +118,5 @@ index e65558ad..65121ba2 100644
         if ( permissions == null )
         {
 -- 
-2.25.0
+2.27.0

--- a/BungeeCord-Patches/0005-Disable-Metrics.patch
+++ b/BungeeCord-Patches/0005-Disable-Metrics.patch
@ -1,4 +1,4 @@
-From a15be97152c853ccd7ee11aa9c3c0eb824e6091c Mon Sep 17 00:00:00 2001
+From 141101eee99241068152524fea62f05cc675267f 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,10 +6,10 @@ 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 6dde4c84..d495655d 100644
+index c1c0f227..15f37d61 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
+@@ -122,7 +122,7 @@ public class BungeeCord extends ProxyServer
      * locations.yml save thread.
      */
     private final Timer saveThread = new Timer( "Reconnect Saver" );
@ -18,7 +18,7 @@ index 6dde4c84..d495655d 100644
     /**
      * Server socket listener.
      */
-@@ -303,7 +303,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 6dde4c84..d495655d 100644
 
         Runtime.getRuntime().addShutdownHook( new Thread()
         {
-@@ -461,7 +461,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.25.0
+2.27.0

--- a/BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch
+++ b/BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch
@ -1,4 +1,4 @@
-From 788b73b7c0d183745f2b47f0bd25645be59dd80f Mon Sep 17 00:00:00 2001
+From e4c9530598b8bd42274013d7830320f2ceef36e0 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.
@ -6,10 +6,10 @@ 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 d495655d..f89dcbc8 100644
+index 15f37d61..bcb229c3 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
+@@ -189,8 +189,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." );
 
@ -103,5 +103,5 @@ index 53c81923..00000000
 -    }
 -}
 -- 
-2.25.0
+2.27.0

--- a/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch
+++ b/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch
@ -1,4 +1,4 @@
-From d096c1c4ceb4f6d8bfb292a9c416aad351dc457b Mon Sep 17 00:00:00 2001
+From 7de6fe2946484fe52af888c1b778ebca99c00d9d 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
@ -56,10 +56,10 @@ index b4dd2049..6ba7e3f7 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 147110e4..a2f62648 100644
+index 95922b34..200166d1 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
-@@ -262,7 +262,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -263,7 +263,7 @@ public class DownstreamBridge extends PacketHandler
 
             brand = ByteBufAllocator.DEFAULT.heapBuffer();
             DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@ -86,5 +86,5 @@ index afc2c12a..c0f7980b 100644
     {
         @Override
 -- 
-2.20.1.windows.1
+2.27.0

--- a/BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch
+++ b/BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch
@ -1,14 +1,14 @@
-From bf47475d013d6745d394ce1019f1c5efd4f6eafa Mon Sep 17 00:00:00 2001
+From 4447c8806c0644058aa41a7a7add6927e28442f7 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 54ec98fd..47bc52de 100644
+index b41b84fb..89aec78f 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
-@@ -323,6 +323,26 @@ public class ComponentsTest
+@@ -387,6 +387,26 @@ public class ComponentsTest
         Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
     }
 
--- a/BungeeCord-Patches/0016-Micro-optimizations.patch
+++ b/BungeeCord-Patches/0016-Micro-optimizations.patch
@ -1,4 +1,4 @@
-From 107b9d76172039b219014ab5c905c175433ed06c Mon Sep 17 00:00:00 2001
+From bfd2fff8357922fce281d103a2db48a82e59c659 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 19 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Micro-optimizations
@ -8,10 +8,10 @@ Subject: [PATCH] Micro-optimizations
 - Don't create a data input stream for every plugin message we get from servers

 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index f89dcbc8..38b96d73 100644
+index bcb229c3..b9d624f8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -558,7 +558,9 @@ public class BungeeCord extends ProxyServer
+@@ -557,7 +557,9 @@ public class BungeeCord extends ProxyServer
         String translation = "<translation '" + name + "' missing>";
         try
         {
@ -23,10 +23,10 @@ index f89dcbc8..38b96d73 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 a2f62648..ea905b07 100644
+index 200166d1..1ee9510b 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
-@@ -244,7 +244,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -245,7 +245,6 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public void handle(PluginMessage pluginMessage) throws Exception
     {
@ -34,7 +34,7 @@ index a2f62648..ea905b07 100644
         PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
 
         if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -271,6 +270,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -272,6 +271,7 @@ public class DownstreamBridge extends PacketHandler
 
         if ( pluginMessage.getTag().equals( "BungeeCord" ) )
         {
@ -43,5 +43,5 @@ index a2f62648..ea905b07 100644
             String subChannel = in.readUTF();
 
 -- 
-2.25.0
+2.27.0

--- a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
@ -1,4 +1,4 @@
-From 9cb2273187f1a4817c370897f150ff99ff3fab50 Mon Sep 17 00:00:00 2001
+From fea07e8bc296e5c62b263660a9c515d8364a45f3 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
@ -19,10 +19,10 @@ index 7ef80bf5..97b7f236 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 ea905b07..6598781b 100644
+index 1ee9510b..d9a52c88 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
-@@ -610,6 +610,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -630,6 +630,6 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public String toString()
     {
@ -69,5 +69,5 @@ index 31777d93..cc141a11 100644
     }
 }
 -- 
-2.20.1.windows.1
+2.27.0

--- a/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch
+++ b/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch
@ -1,4 +1,4 @@
-From 0e6e9228bb854c97cd5b7c628d6e3c510654654d Mon Sep 17 00:00:00 2001
+From 8f074b87748c968933368cc6a9dbfe8daf018321 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,10 +8,10 @@ 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 38b96d73..c2c4c6b6 100644
+index b9d624f8..8649c91e 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
+@@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer
      */
     private ResourceBundle baseBundle;
     private ResourceBundle customBundle;
@ -20,7 +20,7 @@ index 38b96d73..c2c4c6b6 100644
     /**
      * locations.yml save thread.
      */
-@@ -259,7 +259,8 @@ public class BungeeCord extends ProxyServer
+@@ -258,7 +258,8 @@ public class BungeeCord extends ProxyServer
             ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
         }
 
@ -30,7 +30,7 @@ index 38b96d73..c2c4c6b6 100644
 
         File moduleDirectory = new File( "modules" );
         moduleManager.load( this, moduleDirectory );
-@@ -348,7 +349,7 @@ public class BungeeCord extends ProxyServer
+@@ -347,7 +348,7 @@ public class BungeeCord extends ProxyServer
                     .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
                     .childAttr( PipelineUtils.LISTENER, info )
                     .childHandler( PipelineUtils.SERVER_CHILD )
@ -39,7 +39,7 @@ index 38b96d73..c2c4c6b6 100644
                     .localAddress( info.getSocketAddress() )
                     .bind().addListener( listener );
 
-@@ -371,7 +372,7 @@ public class BungeeCord extends ProxyServer
+@@ -370,7 +371,7 @@ public class BungeeCord extends ProxyServer
                         }
                     }
                 };
@ -48,7 +48,7 @@ index 38b96d73..c2c4c6b6 100644
             }
         }
     }
-@@ -480,12 +481,14 @@ public class BungeeCord extends ProxyServer
+@@ -479,12 +480,14 @@ public class BungeeCord extends ProxyServer
         }
 
         getLogger().info( "Closing IO threads" );
@ -83,5 +83,5 @@ index 9d581d9a..7b002089 100644
                 .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
                 .remoteAddress( socketAddress )
 -- 
-2.25.0
+2.27.0

--- a/BungeeCord-Patches/0025-Add-dynamic-server-addition-removal-api.patch
+++ b/BungeeCord-Patches/0025-Add-dynamic-server-addition-removal-api.patch
@ -1,4 +1,4 @@
-From dbfdcc2838644b29aaf53c59b37ec5cb7a9e6091 Mon Sep 17 00:00:00 2001
+From 52eda421ee5716573aaa584cc7c08014f647b533 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,10 +170,10 @@ 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 c2c4c6b6..8fe80fd6 100644
+index 8649c91e..1d141981 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -634,10 +634,18 @@ public class BungeeCord extends ProxyServer
+@@ -633,10 +633,18 @@ public class BungeeCord extends ProxyServer
         return config.getServers();
     }
 
@ -311,5 +311,5 @@ index d640313a..115f614e 100644
 +    // Waterfall end
 }
 -- 
-2.26.1
+2.27.0

--- a/BungeeCord-Patches/0027-Improve-ServerKickEvent.patch
+++ b/BungeeCord-Patches/0027-Improve-ServerKickEvent.patch
@ -1,4 +1,4 @@
-From c370f55c114150f6218f0066a993c0b3cf076645 Mon Sep 17 00:00:00 2001
+From 816a1028af26164e49617c2d532fcc7998dcf537 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
@ -75,7 +75,7 @@ index 97b7f236..6ec13579 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 6598781b..d1654bcc 100644
+index d9a52c88..b83903df 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;
@ -86,7 +86,7 @@ index 6598781b..d1654bcc 100644
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
-@@ -78,16 +79,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -79,16 +80,19 @@ public class DownstreamBridge extends PacketHandler
             return;
         }
 
@ -111,7 +111,7 @@ index 6598781b..d1654bcc 100644
     }
 
     @Override
-@@ -102,7 +106,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -103,7 +107,19 @@ public class DownstreamBridge extends PacketHandler
 
         if ( !server.isObsolete() )
         {
@ -132,7 +132,7 @@ index 6598781b..d1654bcc 100644
         }
 
         ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -494,7 +510,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -514,7 +530,11 @@ public class DownstreamBridge extends PacketHandler
     public void handle(Kick kick) throws Exception
     {
         ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@ -146,5 +146,5 @@ index 6598781b..d1654bcc 100644
         {
             con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.20.1.windows.1
+2.27.0

--- a/BungeeCord-Patches/0028-Configurable-server-version-in-ping-response.patch
+++ b/BungeeCord-Patches/0028-Configurable-server-version-in-ping-response.patch
@ -1,4 +1,4 @@
-From d9effb447d71585fa7badd7d3f55e785f589c2a4 Mon Sep 17 00:00:00 2001
+From 05f79876d9c969dd45af3c5c3d0e0751c19b997d 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,10 +66,10 @@ 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 8fe80fd6..eba0cbd1 100644
+index 1d141981..8c933123 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -688,7 +688,7 @@ public class BungeeCord extends ProxyServer
+@@ -687,7 +687,7 @@ public class BungeeCord extends ProxyServer
     @Override
     public String getGameVersion()
     {
@ -79,5 +79,5 @@ index 8fe80fd6..eba0cbd1 100644
 
     @Override
 -- 
-2.26.1
+2.27.0

--- a/BungeeCord-Patches/0032-Fix-potion-race-condition-on-Forge-1.8.9.patch
+++ b/BungeeCord-Patches/0032-Fix-potion-race-condition-on-Forge-1.8.9.patch
@ -1,4 +1,4 @@
-From 50281584f56b0ea590bba53175658a819d48a6f6 Mon Sep 17 00:00:00 2001
+From 1cd7701d75daa4942b046e1f7fc10368b2153c3a 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
@ -171,7 +171,7 @@ index 00000000..7ed2dc3a
 +    }
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-index 7d0baabb..a254d998 100644
+index 76ab1481..fae9805c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -1,7 +1,9 @@
@ -196,10 +196,10 @@ index 7d0baabb..a254d998 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 d1654bcc..cfd25859 100644
+index b83903df..2e1c6a4c 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
-@@ -50,6 +50,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
+@@ -51,6 +51,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.ProtocolConstants;
 import net.md_5.bungee.protocol.packet.BossBar;
 import net.md_5.bungee.protocol.packet.Commands;
@ -208,7 +208,7 @@ index d1654bcc..cfd25859 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;
-@@ -595,6 +597,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -615,6 +617,32 @@ public class DownstreamBridge extends PacketHandler
         }
     }
 
--- a/BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@ -1,4 +1,4 @@
-From 344d0b1bdeda05ce18b39a90d5b0dc7866cc49e7 Mon Sep 17 00:00:00 2001
+From 9731202a6ca2a028280fd53ce41faedd712fcee3 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 65d4ea6b..c291560d 100644
+index 15a829b6..9c1ec374 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -233,7 +233,7 @@ index 00000000..93ce3b14
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 6f2737e8..570b9ea1 100644
+index ada53ad1..5b283b4b 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -56,6 +56,7 @@
@ -245,7 +245,7 @@ index 6f2737e8..570b9ea1 100644
         <module>protocol</module>
         <module>proxy</module>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 7cc2b4f0..d84b7143 100644
+index f94c54ca..4c61d336 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
@@ -65,7 +65,7 @@
@ -324,7 +324,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 eba0cbd1..1a5650a5 100644
+index 8c933123..d71556a7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -46,7 +46,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -350,7 +350,7 @@ index eba0cbd1..1a5650a5 100644
 import net.md_5.bungee.module.ModuleManager;
 import net.md_5.bungee.netty.PipelineUtils;
 import net.md_5.bungee.protocol.DefinedPacket;
-@@ -96,7 +92,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
+@@ -95,7 +91,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
 import net.md_5.bungee.query.RemoteQuery;
 import net.md_5.bungee.scheduler.BungeeScheduler;
 import net.md_5.bungee.util.CaseInsensitiveMap;
@ -358,7 +358,7 @@ index eba0cbd1..1a5650a5 100644
 
 /**
  * Main BungeeCord proxy class.
-@@ -157,8 +152,12 @@ public class BungeeCord extends ProxyServer
+@@ -156,8 +151,12 @@ public class BungeeCord extends ProxyServer
     private final File pluginsFolder = new File( "plugins" );
     @Getter
     private final BungeeScheduler scheduler = new BungeeScheduler();
@ -371,7 +371,7 @@ index eba0cbd1..1a5650a5 100644
     @Getter
     private final Logger logger;
     public final Gson gson = new GsonBuilder()
-@@ -209,6 +208,8 @@ public class BungeeCord extends ProxyServer
+@@ -208,6 +207,8 @@ public class BungeeCord extends ProxyServer
         // BungeeCord. This version is only used when extracting the libraries to their temp folder.
         System.setProperty( "library.jansi.version", "BungeeCord" );
 
@ -380,7 +380,7 @@ index eba0cbd1..1a5650a5 100644
         AnsiConsole.systemInstall();
         consoleReader = new ConsoleReader();
         consoleReader.setExpandEvents( false );
-@@ -217,6 +218,9 @@ public class BungeeCord extends ProxyServer
+@@ -216,6 +217,9 @@ public class BungeeCord extends ProxyServer
         logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
         System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
         System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
--- a/BungeeCord-Patches/0043-Forge-is-a-first-class-citizen.patch
+++ b/BungeeCord-Patches/0043-Forge-is-a-first-class-citizen.patch
@ -1,14 +1,14 @@
-From 9454adaaeca7ad626b9b0d699694c7fc30bc854c Mon Sep 17 00:00:00 2001
+From 48f0ae897c372ea9a02a982991d2adda25095875 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 1a5650a5..a839cba5 100644
+index d71556a7..289a63d5 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
+@@ -280,8 +280,6 @@ public class BungeeCord extends ProxyServer
             registerChannel( ForgeConstants.FML_TAG );
             registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
             registerChannel( ForgeConstants.FORGE_REGISTER );
@ -31,5 +31,5 @@ index 115f614e..85d2197a 100644
     @Synchronized("serversLock") // Waterfall
     public void load()
 -- 
-2.26.1
+2.27.0

--- a/BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch
+++ b/BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch
@ -1,4 +1,4 @@
-From 9da4de19fb4ab9a7e82b613f9b97287aa703d41b Mon Sep 17 00:00:00 2001
+From 0262fa3c59530531670606fb65d346634019a360 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
@ -123,7 +123,7 @@ index 6ec13579..78401dae 100644
             if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
             {
 diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-index a254d998..4826f0d5 100644
+index fae9805c..b0125245 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -745,4 +745,10 @@ public final class UserConnection implements ProxiedPlayer
@ -138,10 +138,10 @@ index a254d998..4826f0d5 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 cfd25859..f845da09 100644
+index 2e1c6a4c..09bbe594 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
-@@ -601,6 +601,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -621,6 +621,7 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public void handle(EntityEffect entityEffect) throws Exception
     {
@ -149,7 +149,7 @@ index cfd25859..f845da09 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()) {
-@@ -612,6 +613,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -632,6 +633,7 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public void handle(EntityRemoveEffect removeEffect) throws Exception
     {
@ -234,5 +234,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.20.1.windows.1
+2.27.0

--- a/BungeeCord-Patches/0047-Add-ProxyDefineCommandsEvent.patch
+++ b/BungeeCord-Patches/0047-Add-ProxyDefineCommandsEvent.patch
@ -1,4 +1,4 @@
-From 5375aa83fd696e3bf64fbacf3509c33dd60ec531 Mon Sep 17 00:00:00 2001
+From 7b52b8c28a68b2738ba4ca457a00f75d40959539 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 f845da09..d7d0fafc 100644
+index 09bbe594..acedbefe 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 f845da09..d7d0fafc 100644
 import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.ServerConnection;
 import net.md_5.bungee.ServerConnection.KeepAliveData;
-@@ -636,9 +639,25 @@ public class DownstreamBridge extends PacketHandler
+@@ -656,9 +659,25 @@ public class DownstreamBridge extends PacketHandler
     {
         boolean modified = false;
 
@ -107,5 +107,5 @@ index f845da09..d7d0fafc 100644
                 LiteralCommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() )
                         .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
 -- 
-2.26.1
+2.27.0

--- a/BungeeCord-Patches/0054-Add-exception-reporting-event.patch
+++ b/BungeeCord-Patches/0054-Add-exception-reporting-event.patch
@ -1,4 +1,4 @@
-From 7a399e781d556697922a04ff6fd85ca5a5484d4b Mon Sep 17 00:00:00 2001
+From 7840aa368f6f900a61b568be4ac35637a6c4ed07 Mon Sep 17 00:00:00 2001
 From: theminecoder <theminecoder.dev@gmail.com>
 Date: Wed, 22 Apr 2020 14:00:44 +1000
 Subject: [PATCH] Add exception reporting event
@ -642,7 +642,7 @@ index fbfbd546..ae85a1d4 100644
 
     @EventHandler
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index a839cba5..a963c748 100644
+index 289a63d5..2938f2f1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -11,6 +11,8 @@ import com.google.gson.Gson;
@ -654,7 +654,7 @@ index a839cba5..a963c748 100644
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelException;
-@@ -476,7 +478,11 @@ public class BungeeCord extends ProxyServer
+@@ -475,7 +477,11 @@ public class BungeeCord extends ProxyServer
                 }
             } catch ( Throwable t )
             {
@ -695,5 +695,5 @@ index 67db0cc4..02ec98fc 100644
 
             // If we have a period of 0 or less, only run once
 -- 
-2.26.1
+2.27.0

--- a/BungeeCord-Patches/0056-Remove-version-from-brand-info.patch
+++ b/BungeeCord-Patches/0056-Remove-version-from-brand-info.patch
@ -1,4 +1,4 @@
-From 3d60acb1ffe29a463df7b6a831bbf3022159ecc7 Mon Sep 17 00:00:00 2001
+From 413f60fafa3c105ae898014264339fed19c3535f 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
@ -25,10 +25,10 @@ index f5267567..2229d347 100644
 
     <name>Waterfall-Log</name>
 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 d7d0fafc..daac8604 100644
+index acedbefe..8c7e3ab8 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
-@@ -281,7 +281,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -282,7 +282,7 @@ public class DownstreamBridge extends PacketHandler
             Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" );
 
             brand = ByteBufAllocator.DEFAULT.heapBuffer();
@ -38,5 +38,5 @@ index d7d0fafc..daac8604 100644
             brand.release();
             // changes in the packet are ignored so we need to send it manually
 -- 
-2.20.1.windows.1
+2.27.0