Updated Upstream (BungeeCord) (Fixes #840)

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: 19918c69 #3594: Fix missing ComponentStyleSerializer
2024-01-09 11:10:39 +00:00 · 2024-01-09 11:10:39 +00:00 · c1f56949b8
parent b39f272f4f
commit c1f56949b8
11 changed files with 44 additions and 44 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 21c8f2815a7f84dadf6b813bd8bf2116d950e695
+Subproject commit 19918c694f0adc98976b255e99bc43d4c6e982ac
--- 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 50d10b53f384abd66b95bc44162db95203d97488 Mon Sep 17 00:00:00 2001
+From ec9212b56121afd790778af8dc277c5bdf8d1832 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 2024149f..db2a1b99 100644
+index e7f3f09a..0bf89f1c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -189,7 +189,7 @@ public class BungeeCord extends ProxyServer
+@@ -192,7 +192,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 2024149f..db2a1b99 100644
 
         reloadMessages();
 
-@@ -538,7 +538,7 @@ public class BungeeCord extends ProxyServer
+@@ -541,7 +541,7 @@ public class BungeeCord extends ProxyServer
     @Override
     public String getName()
     {
--- a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
+++ b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
@ -1,4 +1,4 @@
-From a75ac072023f7ee77d4bd3754f538dd4d6c70aa8 Mon Sep 17 00:00:00 2001
+From 6ddae20ccb4b7b035ac3b24464671daa01a57056 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 db2a1b99..3429c989 100644
+index 0bf89f1c..3aae1ea4 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -9,6 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -53,7 +53,7 @@ index db2a1b99..3429c989 100644
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelException;
-@@ -114,7 +115,7 @@ public class BungeeCord extends ProxyServer
+@@ -116,7 +117,7 @@ public class BungeeCord extends ProxyServer
      * Configuration.
      */
     @Getter
--- a/BungeeCord-Patches/0005-Disable-Metrics.patch
+++ b/BungeeCord-Patches/0005-Disable-Metrics.patch
@ -1,4 +1,4 @@
-From 4c9105ed4439711a90b5702e1fc1b4a0d41cffc3 Mon Sep 17 00:00:00 2001
+From e79d3a76afb72b8aad4063923f0748177a4956ce 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 3429c989..e3eaee39 100644
+index 3aae1ea4..a64d916a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -125,7 +125,7 @@ public class BungeeCord extends ProxyServer
+@@ -127,7 +127,7 @@ public class BungeeCord extends ProxyServer
      * locations.yml save thread.
      */
     private final Timer saveThread = new Timer( "Reconnect Saver" );
@ -18,7 +18,7 @@ index 3429c989..e3eaee39 100644
     /**
      * Server socket listener.
      */
-@@ -312,7 +312,7 @@ public class BungeeCord extends ProxyServer
+@@ -315,7 +315,7 @@ public class BungeeCord extends ProxyServer
                 }
             }
         }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@ -27,7 +27,7 @@ index 3429c989..e3eaee39 100644
 
         Runtime.getRuntime().addShutdownHook( new Thread()
         {
-@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer
+@@ -473,7 +473,7 @@ public class BungeeCord extends ProxyServer
             reconnectHandler.close();
         }
         saveThread.cancel();
--- a/BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch
+++ b/BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch
@ -1,4 +1,4 @@
-From 9431bb550c8ad9e18872691d9043dac347bb0ac6 Mon Sep 17 00:00:00 2001
+From 092cd796c78358364ed05ae54e4b3c875879393f 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 e3eaee39..89ca9c63 100644
+index a64d916a..3501a4e9 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -120,7 +120,7 @@ public class BungeeCord extends ProxyServer
+@@ -122,7 +122,7 @@ public class BungeeCord extends ProxyServer
      * Localization formats.
      */
     private Map<String, Format> messageFormats;
@ -20,7 +20,7 @@ index e3eaee39..89ca9c63 100644
     /**
      * locations.yml save thread.
      */
-@@ -270,7 +270,8 @@ public class BungeeCord extends ProxyServer
+@@ -273,7 +273,8 @@ public class BungeeCord extends ProxyServer
             ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
         }
 
@ -30,7 +30,7 @@ index e3eaee39..89ca9c63 100644
 
         File moduleDirectory = new File( "modules" );
         moduleManager.load( this, moduleDirectory );
-@@ -359,7 +360,7 @@ public class BungeeCord extends ProxyServer
+@@ -362,7 +363,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 e3eaee39..89ca9c63 100644
                     .localAddress( info.getSocketAddress() )
                     .bind().addListener( listener );
 
-@@ -382,7 +383,7 @@ public class BungeeCord extends ProxyServer
+@@ -385,7 +386,7 @@ public class BungeeCord extends ProxyServer
                         }
                     }
                 };
@ -48,7 +48,7 @@ index e3eaee39..89ca9c63 100644
             }
         }
     }
-@@ -491,12 +492,14 @@ public class BungeeCord extends ProxyServer
+@@ -494,12 +495,14 @@ public class BungeeCord extends ProxyServer
         }
 
         getLogger().info( "Closing IO threads" );
--- a/BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch
+++ b/BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch
@ -1,4 +1,4 @@
-From adfd4ad0550d3830f1bf6baac86ad64f01f228e8 Mon Sep 17 00:00:00 2001
+From d07aa1be7cfc35595ea9d5924fcf2dc989b9ced3 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 89ca9c63..b35236f5 100644
+index 3501a4e9..5a3acccf 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -664,10 +664,18 @@ public class BungeeCord extends ProxyServer
+@@ -667,10 +667,18 @@ public class BungeeCord extends ProxyServer
         return config.getServers();
     }
 
--- a/BungeeCord-Patches/0026-Configurable-server-version-in-ping-response.patch
+++ b/BungeeCord-Patches/0026-Configurable-server-version-in-ping-response.patch
@ -1,4 +1,4 @@
-From 05603a3876fcfa586dc6b9992b5e428f4a100de6 Mon Sep 17 00:00:00 2001
+From a6120b6e56a8930d336561c0254afae4a66a893a 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 b35236f5..06842eb1 100644
+index 5a3acccf..7e2688ee 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -718,7 +718,7 @@ public class BungeeCord extends ProxyServer
+@@ -721,7 +721,7 @@ public class BungeeCord extends ProxyServer
     @Override
     public String getGameVersion()
     {
--- a/BungeeCord-Patches/0034-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0034-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@ -1,4 +1,4 @@
-From 2ec957b0ea78ef67617a5c1c41ea13bf7a138443 Mon Sep 17 00:00:00 2001
+From fc3c0df45ca820c858052a420e1fc8985645fb87 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 3e08cb3c..0c04b87a 100644
+index d8c23f4d..552c279e 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -55,12 +55,13 @@
@ -362,7 +362,7 @@ index 00000000..765d24bc
 +
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index 06842eb1..d60bdeb0 100644
+index 7e2688ee..066e740d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -48,7 +48,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -373,7 +373,7 @@ index 06842eb1..d60bdeb0 100644
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Synchronized;
-@@ -81,15 +80,11 @@ import net.md_5.bungee.command.CommandEnd;
+@@ -83,15 +82,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;
@ -389,7 +389,7 @@ index 06842eb1..d60bdeb0 100644
 import net.md_5.bungee.module.ModuleManager;
 import net.md_5.bungee.netty.PipelineUtils;
 import net.md_5.bungee.protocol.DefinedPacket;
-@@ -98,8 +93,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
+@@ -100,8 +95,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;
@ -398,7 +398,7 @@ index 06842eb1..d60bdeb0 100644
 
 /**
  * Main BungeeCord proxy class.
-@@ -159,8 +152,12 @@ public class BungeeCord extends ProxyServer
+@@ -161,8 +154,12 @@ public class BungeeCord extends ProxyServer
     private final File pluginsFolder = new File( "plugins" );
     @Getter
     private final BungeeScheduler scheduler = new BungeeScheduler();
@ -411,7 +411,7 @@ index 06842eb1..d60bdeb0 100644
     @Getter
     private final Logger logger;
     public final Gson gson = new GsonBuilder()
-@@ -204,6 +201,8 @@ public class BungeeCord extends ProxyServer
+@@ -207,6 +204,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" );
 
@ -420,7 +420,7 @@ index 06842eb1..d60bdeb0 100644
         AnsiConsole.systemInstall();
         consoleReader = new ConsoleReader();
         consoleReader.setExpandEvents( false );
-@@ -228,6 +227,9 @@ public class BungeeCord extends ProxyServer
+@@ -231,6 +230,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 ) );
@ -430,7 +430,7 @@ index 06842eb1..d60bdeb0 100644
 
         pluginManager = new PluginManager( this );
         getPluginManager().registerCommand( null, new CommandReload() );
-@@ -504,10 +506,7 @@ public class BungeeCord extends ProxyServer
+@@ -507,10 +509,7 @@ public class BungeeCord extends ProxyServer
 
         getLogger().info( "Thank you and goodbye" );
         // Need to close loggers after last message!
--- a/BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch
+++ b/BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch
@ -1,14 +1,14 @@
-From ab57199fa438d9abf524c233e569350ec2cfc6e3 Mon Sep 17 00:00:00 2001
+From b7d1b3f0696f9447fb529e50f53dbb9718149f69 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 d60bdeb0..0646684f 100644
+index 066e740d..f25ff75a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -290,8 +290,6 @@ public class BungeeCord extends ProxyServer
+@@ -293,8 +293,6 @@ public class BungeeCord extends ProxyServer
             registerChannel( ForgeConstants.FML_TAG );
             registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
             registerChannel( ForgeConstants.FORGE_REGISTER );
--- a/BungeeCord-Patches/0050-Add-exception-reporting-event.patch
+++ b/BungeeCord-Patches/0050-Add-exception-reporting-event.patch
@ -1,4 +1,4 @@
-From 39ff4f7ba8fb95d22fad85120106e2fe7f87f815 Mon Sep 17 00:00:00 2001
+From 02621fa4a5ab0baf0b146b4e0d50c037b1bbcbac 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 014de202..40792a68 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 0646684f..7cd0017d 100644
+index f25ff75a..b4e101ac 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,8 @@ import com.google.gson.Gson;
@ -654,7 +654,7 @@ index 0646684f..7cd0017d 100644
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelException;
-@@ -485,7 +487,11 @@ public class BungeeCord extends ProxyServer
+@@ -488,7 +490,11 @@ public class BungeeCord extends ProxyServer
                 }
             } catch ( Throwable t )
             {
--- a/BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch
+++ b/BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch
@ -1,4 +1,4 @@
-From 7a1be158a495b23c3d4e77f29dfb72daca03aa10 Mon Sep 17 00:00:00 2001
+From 7feb3c8d993a4bf4a48b7705ff27d67e165f7368 Mon Sep 17 00:00:00 2001
 From: Janmm14 <gitconfig1@janmm14.de>
 Date: Mon, 21 Jun 2021 23:43:39 +0200
 Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
@ -6,10 +6,10 @@ Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
 Thanks for pointing it out @MrIvanPlays

 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 7cd0017d..01c8a172 100644
+index b4e101ac..9b93d2c3 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -358,7 +358,7 @@ public class BungeeCord extends ProxyServer
+@@ -361,7 +361,7 @@ public class BungeeCord extends ProxyServer
                 }
             };
             new ServerBootstrap()