diff --git a/BungeeCord b/BungeeCord index 6ad26cc..697f087 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 6ad26cc8fad8d264d176c404cd3931153eb5753d +Subproject commit 697f0875e65bc57676165b94654992f018e6851c diff --git a/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch b/BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch index 0109e30..9dc6da5 100644 --- 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 783fcdadebdda2819fabc7650072d88e65382a1d Mon Sep 17 00:00:00 2001 +From edb7058f49ff52c35a441e70541ea5d2a57d80b3 Mon Sep 17 00:00:00 2001 From: Tux 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 97568416..bea66b10 100644 +index be5bd490..2929de8d 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -181,7 +181,7 @@ public class BungeeCord extends ProxyServer +@@ -187,7 +187,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 97568416..bea66b10 100644 System.setSecurityManager( new BungeeSecurityManager() ); -@@ -494,7 +494,7 @@ public class BungeeCord extends ProxyServer +@@ -529,7 +529,7 @@ public class BungeeCord extends ProxyServer @Override public String getName() { diff --git a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch index 70f2072..d092502 100644 --- a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch +++ b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch @@ -1,4 +1,4 @@ -From 613341857eeec62fcc4f3adfcac77a9eadb7c2c0 Mon Sep 17 00:00:00 2001 +From b81c7f82796229f0b7cd6d7f28ec72e6cbad64f7 Mon Sep 17 00:00:00 2001 From: Techcable 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 bea66b10..d11c66bb 100644 +index 2929de8d..6dde4c84 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 bea66b10..d11c66bb 100644 import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelException; -@@ -110,7 +111,7 @@ public class BungeeCord extends ProxyServer +@@ -111,7 +112,7 @@ public class BungeeCord extends ProxyServer * Configuration. */ @Getter diff --git a/BungeeCord-Patches/0005-Disable-Metrics.patch b/BungeeCord-Patches/0005-Disable-Metrics.patch index d17d582..c86b907 100644 --- a/BungeeCord-Patches/0005-Disable-Metrics.patch +++ b/BungeeCord-Patches/0005-Disable-Metrics.patch @@ -1,4 +1,4 @@ -From 157cff1f3abbcb6f9949a36102bc7e33583d6858 Mon Sep 17 00:00:00 2001 +From a15be97152c853ccd7ee11aa9c3c0eb824e6091c Mon Sep 17 00:00:00 2001 From: Jamie Mansfield 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 d11c66bb..7fe9cad0 100644 +index 6dde4c84..d495655d 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -122,7 +122,7 @@ public class BungeeCord extends ProxyServer +@@ -123,7 +123,7 @@ public class BungeeCord extends ProxyServer * locations.yml save thread. */ private final Timer saveThread = new Timer( "Reconnect Saver" ); @@ -18,24 +18,24 @@ index d11c66bb..7fe9cad0 100644 /** * Server socket listener. */ -@@ -297,7 +297,7 @@ public class BungeeCord extends ProxyServer +@@ -303,7 +303,7 @@ public class BungeeCord extends ProxyServer } } }, 0, TimeUnit.MINUTES.toMillis( 5 ) ); - metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) ); -+ // metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) ); // Waterfall: Disable Metrics - } ++ //metricsThread.scheduleAtFixedRate( new Metrics(), 0, TimeUnit.MINUTES.toMillis( Metrics.PING_INTERVAL ) ); // Waterfall: Disable Metrics - public void startListeners() -@@ -431,7 +431,7 @@ public class BungeeCord extends ProxyServer - reconnectHandler.close(); - } - saveThread.cancel(); -- metricsThread.cancel(); -+ // metricsThread.cancel(); // Waterfall: Disable Metrics + Runtime.getRuntime().addShutdownHook( new Thread() + { +@@ -461,7 +461,7 @@ public class BungeeCord extends ProxyServer + reconnectHandler.close(); + } + saveThread.cancel(); +- metricsThread.cancel(); ++ //metricsThread.cancel(); // Waterfall: Disable Metrics - // TODO: Fix this shit - getLogger().info( "Disabling plugins" ); + getLogger().info( "Disabling plugins" ); + for ( Plugin plugin : Lists.reverse( new ArrayList<>( pluginManager.getPlugins() ) ) ) diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java deleted file mode 100644 index eabf7573..00000000 diff --git a/BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch b/BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch index a26900c..38b4d32 100644 --- 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 bbda244687d39a056bce4c92bad5069eb9deb73e Mon Sep 17 00:00:00 2001 +From 788b73b7c0d183745f2b47f0bd25645be59dd80f Mon Sep 17 00:00:00 2001 From: Tux 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 7fe9cad0..8d13d49f 100644 +index d495655d..f89dcbc8 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -184,8 +184,6 @@ public class BungeeCord extends ProxyServer +@@ -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." ); diff --git a/BungeeCord-Patches/0016-Micro-optimizations.patch b/BungeeCord-Patches/0016-Micro-optimizations.patch index 072ea0f..a3bcca3 100644 --- a/BungeeCord-Patches/0016-Micro-optimizations.patch +++ b/BungeeCord-Patches/0016-Micro-optimizations.patch @@ -1,4 +1,4 @@ -From 91cb5ca08458019081a0c4f463d2df21451da80f Mon Sep 17 00:00:00 2001 +From 107b9d76172039b219014ab5c905c175433ed06c Mon Sep 17 00:00:00 2001 From: Tux 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 8d13d49f..5643684c 100644 +index f89dcbc8..38b96d73 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -523,7 +523,9 @@ public class BungeeCord extends ProxyServer +@@ -558,7 +558,9 @@ public class BungeeCord extends ProxyServer String translation = ""; try { diff --git 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 index 191fb66..27a54fa 100644 --- 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 61eb721efb50a13bb3de793753cf74764d54850c Mon Sep 17 00:00:00 2001 +From 0e6e9228bb854c97cd5b7c628d6e3c510654654d Mon Sep 17 00:00:00 2001 From: kamcio96 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 5643684c..b18027e2 100644 +index 38b96d73..c2c4c6b6 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer +@@ -118,7 +118,7 @@ public class BungeeCord extends ProxyServer */ private ResourceBundle baseBundle; private ResourceBundle customBundle; @@ -20,7 +20,7 @@ index 5643684c..b18027e2 100644 /** * locations.yml save thread. */ -@@ -253,7 +253,8 @@ public class BungeeCord extends ProxyServer +@@ -259,7 +259,8 @@ public class BungeeCord extends ProxyServer ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance } @@ -30,7 +30,7 @@ index 5643684c..b18027e2 100644 File moduleDirectory = new File( "modules" ); moduleManager.load( this, moduleDirectory ); -@@ -333,7 +334,7 @@ public class BungeeCord extends ProxyServer +@@ -348,7 +349,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 5643684c..b18027e2 100644 .localAddress( info.getSocketAddress() ) .bind().addListener( listener ); -@@ -356,7 +357,7 @@ public class BungeeCord extends ProxyServer +@@ -371,7 +372,7 @@ public class BungeeCord extends ProxyServer } } }; @@ -48,16 +48,16 @@ index 5643684c..b18027e2 100644 } } } -@@ -451,12 +452,14 @@ public class BungeeCord extends ProxyServer - } +@@ -480,12 +481,14 @@ public class BungeeCord extends ProxyServer + } - getLogger().info( "Closing IO threads" ); -- eventLoops.shutdownGracefully(); -- try -- { -- eventLoops.awaitTermination( Long.MAX_VALUE, TimeUnit.NANOSECONDS ); -- } catch ( InterruptedException ex ) -- { + getLogger().info( "Closing IO threads" ); +- eventLoops.shutdownGracefully(); +- try +- { +- eventLoops.awaitTermination( Long.MAX_VALUE, TimeUnit.NANOSECONDS ); +- } catch ( InterruptedException ex ) +- { + bossEventLoopGroup.shutdownGracefully(); + workerEventLoopGroup.shutdownGracefully(); + while (true) { @@ -66,9 +66,9 @@ index 5643684c..b18027e2 100644 + workerEventLoopGroup.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); + break; + } catch (InterruptedException ignored) {} - } + } - getLogger().info( "Thank you and goodbye" ); + 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 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java diff --git a/BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch b/BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch index dd41ec4..f7a7898 100644 --- a/BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch +++ b/BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch @@ -1,4 +1,4 @@ -From 221084c6a92729adb87f71dfe381799a78852869 Mon Sep 17 00:00:00 2001 +From 6a36bb4be7ec3ae346ebeb4929db9505c0c240f2 Mon Sep 17 00:00:00 2001 From: Troy Frew 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 b18027e2..d572ff28 100644 +index c2c4c6b6..8fe80fd6 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -599,10 +599,18 @@ public class BungeeCord extends ProxyServer +@@ -634,10 +634,18 @@ public class BungeeCord extends ProxyServer return config.getServers(); } diff --git a/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch b/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch index a37fd89..4af3491 100644 --- a/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch +++ b/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch @@ -1,4 +1,4 @@ -From d889bb2dc25aca87073e4708e9fad8fade6d7cd7 Mon Sep 17 00:00:00 2001 +From 0114656f571bde36d57728d61b7a7131b3584866 Mon Sep 17 00:00:00 2001 From: Troy Frew 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 d572ff28..8b719c3c 100644 +index 8fe80fd6..eba0cbd1 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -653,7 +653,7 @@ public class BungeeCord extends ProxyServer +@@ -688,7 +688,7 @@ public class BungeeCord extends ProxyServer @Override public String getGameVersion() { diff --git a/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch index 3dcfecc..78b5ca8 100644 --- a/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch +++ b/BungeeCord-Patches/0037-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch @@ -1,4 +1,4 @@ -From 211d83d5dc9d417b84fdbaf1105b984af12acc4b Mon Sep 17 00:00:00 2001 +From ff4d92a33380ea2c3a274f84f948c975cdca1839 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 22 Sep 2017 12:46:47 +0200 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for @@ -324,10 +324,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 8b719c3c..ce93fa50 100644 +index eba0cbd1..1a5650a5 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; +@@ -46,7 +46,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.Logger; @@ -335,7 +335,7 @@ index 8b719c3c..ce93fa50 100644 import lombok.Getter; import lombok.Setter; import lombok.Synchronized; -@@ -78,14 +77,11 @@ import net.md_5.bungee.command.CommandEnd; +@@ -79,14 +78,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; @@ -350,7 +350,7 @@ index 8b719c3c..ce93fa50 100644 import net.md_5.bungee.module.ModuleManager; import net.md_5.bungee.netty.PipelineUtils; import net.md_5.bungee.protocol.DefinedPacket; -@@ -95,7 +91,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage; +@@ -96,7 +92,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 8b719c3c..ce93fa50 100644 /** * Main BungeeCord proxy class. -@@ -151,8 +146,12 @@ public class BungeeCord extends ProxyServer +@@ -157,8 +152,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 8b719c3c..ce93fa50 100644 @Getter private final Logger logger; public final Gson gson = new GsonBuilder() -@@ -203,6 +202,8 @@ public class BungeeCord extends ProxyServer +@@ -209,6 +208,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 8b719c3c..ce93fa50 100644 AnsiConsole.systemInstall(); consoleReader = new ConsoleReader(); consoleReader.setExpandEvents( false ); -@@ -211,6 +212,9 @@ public class BungeeCord extends ProxyServer +@@ -217,6 +218,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 ) ); diff --git a/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch b/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch index 8aef171..aa79f0b 100644 --- a/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch +++ b/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch @@ -1,14 +1,14 @@ -From dd2cf45d254e2cb6248febee298fd430badc264a Mon Sep 17 00:00:00 2001 +From 0469a99ed97eed64ceb82328541d889572b2179b Mon Sep 17 00:00:00 2001 From: Jamie Mansfield 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 ce93fa50..c7ac1735 100644 +index 1a5650a5..a839cba5 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java -@@ -275,8 +275,6 @@ public class BungeeCord extends ProxyServer +@@ -281,8 +281,6 @@ public class BungeeCord extends ProxyServer registerChannel( ForgeConstants.FML_TAG ); registerChannel( ForgeConstants.FML_HANDSHAKE_TAG ); registerChannel( ForgeConstants.FORGE_REGISTER );