Updated Upstream (BungeeCord)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
511017ab #3396: Update Netty version
c3e8cfac #3374, #3389: Improve log handling of normal java.util Logger usage by forwarding the LogRecords directly to the BungeeLogger instead of the fallback err stream.
bf2b3c68 #3384: Update documentation of ProxyPingEvent
68e74a8c #3378: Remove KickStringWriter from the pipeline after handshake arrives
5b4a5404 #3361: Cache MessageFormats for translations
88da5c05 #3353: Update GitHub actions

BungeeCord

@@ -1 +1 @@
-Subproject commit 2d369e894546b3c180ecf931317c6fabff3149c0
+Subproject commit 511017ab35e621f4173e7425c0735aa3c19b3964

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

@@ -1,4 +1,4 @@
-From 42faba74464b079a46f3c6703f3d189206fa2b23 Mon Sep 17 00:00:00 2001
+From 9ec33f3c55ffd519b35f4a5a822db2e8d993a620 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,19 +18,19 @@ 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 c3bb3afa..ee4d5282 100644
+index c2fe9a40..e3065f12 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
+@@ -189,7 +189,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.
 -        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." );
  
-         try
-         {
-@@ -528,7 +528,7 @@ public class BungeeCord extends ProxyServer
+         reloadMessages();
+ 
+@@ -538,7 +538,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 2691b8b8..8c25b711 100644
+index 150d8739..8ae799c1 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 2691b8b8..8c25b711 100644
              SocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.30.1 (Apple Git-130)
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 7824ec691a9fb695159ed9a74c7b623f86668cd6 Mon Sep 17 00:00:00 2001
+From ece5cfccb9506cc13bb552613cc9424afff3ae51 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 998316c3..f8f3fb44 100644
+index e3065f12..f1ddb4d0 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,17 +53,17 @@ index 998316c3..f8f3fb44 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
+@@ -114,7 +115,7 @@ public class BungeeCord extends ProxyServer
       * Configuration.
       */
      @Getter
 -    public final Configuration config = new Configuration();
 +    public final Configuration config = new WaterfallConfiguration();
      /**
-      * Localization bundle.
+      * Localization formats.
       */
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index e1a6b2b3..56a0f29c 100644
+index 54c3223c..54a6cb38 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 @@ -24,7 +24,7 @@ import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -76,7 +76,7 @@ index e1a6b2b3..56a0f29c 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 e65558ad..65121ba2 100644
+index 8ae799c1..0dd69778 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
 @@ -47,10 +47,15 @@ public class YamlConfig implements ConfigurationAdapter
@@ -118,5 +118,5 @@ index e65558ad..65121ba2 100644
          if ( permissions == null )
          {
 -- 
-2.31.1
+2.38.1
 

BungeeCord-Patches/0005-Disable-Metrics.patch

@@ -1,4 +1,4 @@
-From 89153d0b39356124f0a3fd4dec5a4fbf525caf93 Mon Sep 17 00:00:00 2001
+From d5aef08f1513e5e51b92d60e10e528d7b82ad40d 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 582be876..dddc14d8 100644
+index f1ddb4d0..ffff990a 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
+@@ -125,7 +125,7 @@ public class BungeeCord extends ProxyServer
       * locations.yml save thread.
       */
      private final Timer saveThread = new Timer( "Reconnect Saver" );
@@ -18,7 +18,7 @@ index 582be876..dddc14d8 100644
      /**
       * Server socket listener.
       */
-@@ -302,7 +302,7 @@ public class BungeeCord extends ProxyServer
+@@ -312,7 +312,7 @@ public class BungeeCord extends ProxyServer
                  }
              }
          }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@@ -27,7 +27,7 @@ index 582be876..dddc14d8 100644
  
          Runtime.getRuntime().addShutdownHook( new Thread()
          {
-@@ -460,7 +460,7 @@ public class BungeeCord extends ProxyServer
+@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer
              reconnectHandler.close();
          }
          saveThread.cancel();
@@ -177,5 +177,5 @@ index eabf7573..00000000
 -    }
 -}
 -- 
-2.30.1 (Apple Git-130)
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 3abcc263d07ca4f3297170abbb7fe4fc3e373195 Mon Sep 17 00:00:00 2001
+From 09154e5194baacc038eba0543acb428c599d33d5 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
@@ -250,10 +250,10 @@ index 88d36ad2..fc92a7b5 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 74362ef9..94db72b0 100644
+index d2f90b93..0e08e71d 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
-@@ -712,7 +712,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -713,7 +713,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {
@@ -263,5 +263,5 @@ index 74362ef9..94db72b0 100644
  
      @Override
 -- 
-2.37.1
+2.38.1
 

BungeeCord-Patches/0015-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From 57a159ccea803646202595a832cee7da8d2d489b Mon Sep 17 00:00:00 2001
+From 4a506692e5bb55cbf8e871f4612fb9a53dad822e 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
@@ -7,21 +7,6 @@ Subject: [PATCH] Micro-optimizations
 - Don't attempt to format arguments when there are none provided
 - 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 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
-         String translation = "<translation '" + name + "' missing>";
-         try
-         {
--            translation = MessageFormat.format( customBundle != null && customBundle.containsKey( name ) ? customBundle.getString( name ) : baseBundle.getString( name ), args );
-+            final String string = customBundle != null && customBundle.containsKey( name ) ? customBundle.getString( name ) : baseBundle.getString( name );
-+
-+            translation = ( args.length == 0 ) ? string : MessageFormat.format( string, args );
-         } catch ( MissingResourceException ex )
-         {
-         }
 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 e41bfcfd..9c724115 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -43,5 +28,5 @@ index e41bfcfd..9c724115 100644
              String subChannel = in.readUTF();
  
 -- 
-2.37.1
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From a2d3b8db72aabd1de2bf7c573381daf0eb36f763 Mon Sep 17 00:00:00 2001
+From 807ec5dcb9380f01a593df69e5576117f306ce37 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
@@ -31,10 +31,10 @@ index 9c724115..a0301a95 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 94db72b0..562afbaa 100644
+index 0e08e71d..c2f26bc7 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
-@@ -718,20 +718,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -719,20 +719,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {
@@ -69,5 +69,5 @@ index 147e5b20..d560cef6 100644
      }
  }
 -- 
-2.37.1
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 149622abd47e5819a8f986288c13b8f5e539f7b5 Mon Sep 17 00:00:00 2001
+From 0746624ff19bfb531724e96f65d9d244268bdbc1 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,19 +8,19 @@ 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 7227f268..edb173d1 100644
+index ffff990a..0c9ffbf6 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
+@@ -120,7 +120,7 @@ public class BungeeCord extends ProxyServer
+      * Localization formats.
       */
-     private ResourceBundle baseBundle;
-     private ResourceBundle customBundle;
+     private Map<String, Format> messageFormats;
 -    public EventLoopGroup eventLoops;
 +    public EventLoopGroup bossEventLoopGroup, workerEventLoopGroup;
      /**
       * locations.yml save thread.
       */
-@@ -260,7 +260,8 @@ public class BungeeCord extends ProxyServer
+@@ -270,7 +270,8 @@ public class BungeeCord extends ProxyServer
              ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
          }
  
@@ -30,7 +30,7 @@ index 7227f268..edb173d1 100644
  
          File moduleDirectory = new File( "modules" );
          moduleManager.load( this, moduleDirectory );
-@@ -349,7 +350,7 @@ public class BungeeCord extends ProxyServer
+@@ -359,7 +360,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 7227f268..edb173d1 100644
                      .localAddress( info.getSocketAddress() )
                      .bind().addListener( listener );
  
-@@ -372,7 +373,7 @@ public class BungeeCord extends ProxyServer
+@@ -382,7 +383,7 @@ public class BungeeCord extends ProxyServer
                          }
                      }
                  };
@@ -48,7 +48,7 @@ index 7227f268..edb173d1 100644
              }
          }
      }
-@@ -481,12 +482,14 @@ public class BungeeCord extends ProxyServer
+@@ -491,12 +492,14 @@ public class BungeeCord extends ProxyServer
          }
  
          getLogger().info( "Closing IO threads" );
@@ -70,7 +70,7 @@ index 7227f268..edb173d1 100644
  
          getLogger().info( "Thank you and goodbye" );
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-index 9d581d9a..7b002089 100644
+index 16dd8eec..1ea654f1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
 @@ -184,7 +184,7 @@ public class BungeeServerInfo implements ServerInfo
@@ -83,5 +83,5 @@ index 9d581d9a..7b002089 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
                  .remoteAddress( socketAddress )
 -- 
-2.30.1 (Apple Git-130)
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 63b26176f10efef2416eb1b75dc355eebb6bf611 Mon Sep 17 00:00:00 2001
+From 3a8d473e3e304df19e648d61588b3ec23051d74a 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 edb173d1..7d08b164 100644
+index 0c9ffbf6..8f6923a5 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
+@@ -660,10 +660,18 @@ public class BungeeCord extends ProxyServer
          return config.getServers();
      }
  
@@ -311,5 +311,5 @@ index ecd3b619..7094fe0b 100644
 +    // Waterfall end
  }
 -- 
-2.35.3
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From d8edfd4f25297caf0e989e55fe987bb86bc47c36 Mon Sep 17 00:00:00 2001
+From 6aed025ba52a9bcfaca7663d6a06afd04d219630 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 7d08b164..1db22fc6 100644
+index 8f6923a5..a1ec1c17 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
+@@ -714,7 +714,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getGameVersion()
      {
@@ -79,5 +79,5 @@ index 7d08b164..1db22fc6 100644
  
      @Override
 -- 
-2.30.1 (Apple Git-130)
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From c1690b6f6906281fb06aa0bb3f2184aa73f1b9d6 Mon Sep 17 00:00:00 2001
+From 8e937bd458b9571e4b0ea0f21f336194a7ac013c 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..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index fad424b6..2b544c23 100644
+index 2ffe12f2..26f32b37 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,11 +56,12 @@
@@ -350,10 +350,10 @@ 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 1db22fc6..66d38b40 100644
+index a1ec1c17..22f5243f 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;
+@@ -48,7 +48,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  import java.util.logging.Handler;
  import java.util.logging.Level;
  import java.util.logging.Logger;
@@ -361,7 +361,7 @@ index 1db22fc6..66d38b40 100644
  import lombok.Getter;
  import lombok.Setter;
  import lombok.Synchronized;
-@@ -79,14 +78,11 @@ import net.md_5.bungee.command.CommandEnd;
+@@ -81,15 +80,11 @@ import net.md_5.bungee.command.CommandEnd;
  import net.md_5.bungee.command.CommandIP;
  import net.md_5.bungee.command.CommandPerms;
  import net.md_5.bungee.command.CommandReload;
@@ -372,11 +372,12 @@ index 1db22fc6..66d38b40 100644
  import net.md_5.bungee.conf.YamlConfig;
  import net.md_5.bungee.forge.ForgeConstants;
 -import net.md_5.bungee.log.BungeeLogger;
+-import net.md_5.bungee.log.LoggingForwardHandler;
 -import net.md_5.bungee.log.LoggingOutputStream;
  import net.md_5.bungee.module.ModuleManager;
  import net.md_5.bungee.netty.PipelineUtils;
  import net.md_5.bungee.protocol.DefinedPacket;
-@@ -95,8 +91,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
+@@ -98,8 +93,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;
@@ -385,7 +386,7 @@ index 1db22fc6..66d38b40 100644
  
  /**
   * Main BungeeCord proxy class.
-@@ -157,8 +151,12 @@ public class BungeeCord extends ProxyServer
+@@ -159,8 +152,12 @@ public class BungeeCord extends ProxyServer
      private final File pluginsFolder = new File( "plugins" );
      @Getter
      private final BungeeScheduler scheduler = new BungeeScheduler();
@@ -398,7 +399,7 @@ index 1db22fc6..66d38b40 100644
      @Getter
      private final Logger logger;
      public final Gson gson = new GsonBuilder()
-@@ -209,6 +207,8 @@ public class BungeeCord extends ProxyServer
+@@ -204,6 +201,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" );
  
@@ -407,8 +408,8 @@ index 1db22fc6..66d38b40 100644
          AnsiConsole.systemInstall();
          consoleReader = new ConsoleReader();
          consoleReader.setExpandEvents( false );
-@@ -218,6 +218,9 @@ public class BungeeCord extends ProxyServer
-         JDK14LoggerFactory.LOGGER = logger;
+@@ -228,6 +227,9 @@ public class BungeeCord extends ProxyServer
+         // since it applies a nice looking format and also writes to the logfile.
          System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
          System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
 +        */
@@ -417,7 +418,7 @@ index 1db22fc6..66d38b40 100644
  
          pluginManager = new PluginManager( this );
          getPluginManager().registerCommand( null, new CommandReload() );
-@@ -494,10 +497,7 @@ public class BungeeCord extends ProxyServer
+@@ -504,10 +506,7 @@ public class BungeeCord extends ProxyServer
  
          getLogger().info( "Thank you and goodbye" );
          // Need to close loggers after last message!
@@ -430,7 +431,7 @@ index 1db22fc6..66d38b40 100644
          // Unlock the thread before optionally calling system exit, which might invoke this function again.
          // If that happens, the system will obtain the lock, and then see that isRunning == false and return without doing anything.
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index c2512dd5..0db3d76a 100644
+index c81a4430..96a9998d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 @@ -68,6 +68,9 @@ public class BungeeCordLauncher
@@ -1616,5 +1617,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.37.1
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From b2a739fbebcd8447a6c8bd39d17c63780e8f616c Mon Sep 17 00:00:00 2001
+From 730364aac5da3bcc5448a242e4d3b6f8525e2528 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,10 +52,10 @@ 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 fd03d152..2df797fa 100644
+index cd0a459c..935daa5d 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
-@@ -626,7 +626,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -627,7 +627,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          };
  
          // fire login event
@@ -65,5 +65,5 @@ index fd03d152..2df797fa 100644
  
      @Override
 -- 
-2.37.1
+2.38.1
 

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

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

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

@@ -1,14 +1,14 @@
-From 27713874f8c4678f4aaa03278614388d897a207c Mon Sep 17 00:00:00 2001
+From 270491b5947c02fdb02fa2ef25a5741f1e9465cb 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 66d38b40..06784d1e 100644
+index 22f5243f..ef4e5edf 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
+@@ -290,8 +290,6 @@ public class BungeeCord extends ProxyServer
              registerChannel( ForgeConstants.FML_TAG );
              registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
              registerChannel( ForgeConstants.FORGE_REGISTER );
@@ -31,5 +31,5 @@ index 7094fe0b..8911bee8 100644
      @Synchronized("serversLock") // Waterfall
      public void load()
 -- 
-2.35.3
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 6a64004d21456f947e63aaa1d1a039fca8a3bb92 Mon Sep 17 00:00:00 2001
+From 874380a169f4fc28c668f7015af39e996ce77e1e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 25 Nov 2019 19:54:06 +0000
 Subject: [PATCH] Speed up some common exceptions
@@ -146,7 +146,7 @@ index b68b33a9..f5e414c1 100644
          {
              if ( slice != null )
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 1dc2ad3c..5331518b 100644
+index ddc04fda..4346696f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 @@ -16,6 +16,8 @@ import java.util.Set;
@@ -158,7 +158,7 @@ index 1dc2ad3c..5331518b 100644
  import lombok.Getter;
  import lombok.RequiredArgsConstructor;
  import net.md_5.bungee.BungeeCord;
-@@ -470,6 +472,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -471,6 +473,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
  
          SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
@@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644
  
              // Waterfall start
 -- 
-2.37.2
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 1e0eebdd511f09952c96780603ec4ba3c50bf051 Mon Sep 17 00:00:00 2001
+From a840443d6e16750852e70f923f07a1576937799e 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 06784d1e..d4df4c17 100644
+index ef4e5edf..15fb4ad2 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 06784d1e..d4df4c17 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
+@@ -485,7 +487,11 @@ public class BungeeCord extends ProxyServer
                  }
              } catch ( Throwable t )
              {
@@ -695,5 +695,5 @@ index 38b75b51..02ec98fc 100644
  
              // If we have a period of 0 or less, only run once
 -- 
-2.37.2
+2.38.1
 

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

@@ -1,11 +1,11 @@
-From e1900e56571d893043a6f83368c0de0e11f656d2 Mon Sep 17 00:00:00 2001
+From e07001b69a3370c95044abfd165571726c00e20c Mon Sep 17 00:00:00 2001
 From: theminecoder <theminecoder.dev@gmail.com>
 Date: Sun, 19 Jul 2020 10:18:23 +1000
 Subject: [PATCH] Add auth url option
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 5331518b..5ee47b6a 100644
+index 4346696f..55620acc 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 @@ -76,6 +76,8 @@ import net.md_5.bungee.util.QuietException;
@@ -17,7 +17,7 @@ index 5331518b..5ee47b6a 100644
      private final BungeeCord bungee;
      private ChannelWrapper ch;
      @Getter
-@@ -498,7 +500,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -499,7 +501,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
  
          String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : "";
@@ -27,5 +27,5 @@ index 5331518b..5ee47b6a 100644
          Callback<String> handler = new Callback<String>()
          {
 -- 
-2.37.2
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 56e1c45d29bbb4edf52f4663628ba7743400f2e2 Mon Sep 17 00:00:00 2001
+From 2cd21b7b20cde396fa6d8713116f055dce6b72f4 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Don't bother locking to fetch a v4 UUID from the offline
 
 
 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 d4df4c17..9ef2b77a 100644
+index 15fb4ad2..e0fcd8fb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -610,6 +610,11 @@ public class BungeeCord extends ProxyServer
+@@ -634,6 +634,11 @@ public class BungeeCord extends ProxyServer
  
      public UserConnection getPlayerByOfflineUUID(UUID name)
      {
@@ -22,5 +22,5 @@ index d4df4c17..9ef2b77a 100644
          try
          {
 -- 
-2.37.2
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 081317fa31119499ac8661bbdbb2c8207d99322d Mon Sep 17 00:00:00 2001
+From 9fe93823a56f1f2b50458d1842b2d9d5b79fecdb Mon Sep 17 00:00:00 2001
 From: FivePB <admin@fivepb.me>
 Date: Tue, 16 Nov 2021 21:15:32 +0100
 Subject: [PATCH] Configurable plugin messaging limits
@@ -83,10 +83,10 @@ index b88e3c8a..da0efa36 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 5ee47b6a..4a8cb3df 100644
+index 55620acc..80d8843f 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
-@@ -754,9 +754,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -755,9 +755,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
  
              for ( String id : content.split( "\0" ) )
              {
@@ -101,5 +101,5 @@ index 5ee47b6a..4a8cb3df 100644
              }
          } else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
 -- 
-2.37.2
+2.38.1
 

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

@@ -1,14 +1,14 @@
-From 34ac95f94206ae5c449a1bb6fffca5dfa16b1256 Mon Sep 17 00:00:00 2001
+From 109cbe179f1d34fe5da186c8ea3e32f2a7236053 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 8 May 2022 12:04:30 +0100
 Subject: [PATCH] Improve login state transition
 
 
 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 4a8cb3df..6011078f 100644
+index 80d8843f..e8ceddf7 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
-@@ -472,6 +472,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -473,6 +473,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      {
          Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
          Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
@@ -16,7 +16,7 @@ index 4a8cb3df..6011078f 100644
  
          SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
          // Waterfall start
-@@ -526,7 +527,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -527,7 +528,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                  }
              }
          };
@@ -26,5 +26,5 @@ index 4a8cb3df..6011078f 100644
      }
  
 -- 
-2.37.2
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 1106fef0e1590a513bb90264917f15ec77626251 Mon Sep 17 00:00:00 2001
+From 0e1d3e227cfd6fead7f0c0377fb2807efb98b515 Mon Sep 17 00:00:00 2001
 From: Aurora <aurora@relanet.eu>
 Date: Mon, 18 Jul 2022 15:56:05 +0200
 Subject: [PATCH] Add message for outdated clients that don't support secure
@@ -8,10 +8,10 @@ Clients before 1.19 don't support secure profiles, but since secure profiles is
 things checked those outdated clients didn't get a useful message telling them to update.
 
 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 6011078f..975b6996 100644
+index e8ceddf7..c1fbf84c 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
-@@ -395,6 +395,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -396,6 +396,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
  
          if ( BungeeCord.getInstance().config.isEnforceSecureProfile() )
          {
@@ -32,5 +32,5 @@ index e42b798b..76ad621f 100644
  error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
  error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}
 -- 
-2.37.2
+2.38.1