Merge upstream

BungeeCord

@@ -1 +1 @@
-Subproject commit dda06388692fa199c149a4fdab238fb5d04a7ebf
+Subproject commit 050d9358915cc32f933c62d0a2ee1b3f7396509f

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 8aed75956a6fb0f71c74073e815c6f471c312d56 Mon Sep 17 00:00:00 2001
+From c94be33fc7712e1c3d990c106b7a86b67ac2d697 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 10:33:31 -0700
 Subject: [PATCH] POM Changes
@@ -494,7 +494,7 @@ index 082f0908..8b045e3b 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 276631eb..0c281746 100644
+index b378490e..6b4c1606 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -589,7 +589,7 @@ index 276631eb..0c281746 100644
  
      <properties>
          <build.number>unknown</build.number>
-         <netty.version>4.1.18.Final</netty.version>
+         <netty.version>4.1.19.Final</netty.version>
 -        <maven.compiler.source>1.7</maven.compiler.source>
 -        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->
@@ -716,7 +716,7 @@ index bf4b399a..9a4b6529 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 09af6a92..31a5aeb1 100644
+index be113c0d..f839ff88 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@

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

@@ -1,4 +1,4 @@
-From b8244a39704c2a4b777cdd982083daeade84bbb1 Mon Sep 17 00:00:00 2001
+From 7b85684874255cae79234bec39f375ea3f5e57d3 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
@@ -53,10 +53,10 @@ index 9d51608d..446dfe2f 100644
  
          while ( bungee.isRunning )
 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 43c8862f..95b7c060 100644
+index 2b6c6995..f90bc370 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -178,7 +178,7 @@ public class BungeeCord extends ProxyServer
+@@ -179,7 +179,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.
@@ -65,7 +65,7 @@ index 43c8862f..95b7c060 100644
  
          System.setSecurityManager( new BungeeSecurityManager() );
  
-@@ -468,7 +468,7 @@ public class BungeeCord extends ProxyServer
+@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {

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

@@ -1,4 +1,4 @@
-From 1893ed633fc97a855d0e657baa09feec9f007d11 Mon Sep 17 00:00:00 2001
+From 8bcbac6bb22e605d7e9bb751c74ba1ac2bef3373 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
@@ -43,7 +43,7 @@ index 00000000..f9e277dc
 +    }
 +}
 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 510841c7..78808fb9 100644
+index f90bc370..06ceabb9 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,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -54,7 +54,7 @@ index 510841c7..78808fb9 100644
  import io.netty.bootstrap.ServerBootstrap;
  import io.netty.channel.Channel;
  import io.netty.channel.ChannelException;
-@@ -103,7 +104,7 @@ public class BungeeCord extends ProxyServer
+@@ -104,7 +105,7 @@ public class BungeeCord extends ProxyServer
       * Configuration.
       */
      @Getter
@@ -119,5 +119,5 @@ index 95590b6d..1019c307 100644
          if ( permissions.isEmpty() )
          {
 -- 
-2.14.1
+2.14.3
 

BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch

@@ -1,4 +1,4 @@
-From 843cdaca4e3322b60407704cfdfd1c83833a43d0 Mon Sep 17 00:00:00 2001
+From f3583f4a0d45342a59b462af34d68c93705ba8b3 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 10:55:20 -0700
 Subject: [PATCH] Configurable Waterfall Metrics
@@ -46,10 +46,10 @@ index f9e277dc..056b8040 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 fb349dcf..b859b498 100644
+index 06ceabb9..87b17dc8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -283,7 +283,9 @@ public class BungeeCord extends ProxyServer
+@@ -285,7 +285,9 @@ public class BungeeCord extends ProxyServer
                  }
              }
          }, 0, TimeUnit.MINUTES.toMillis( 5 ) );

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

@@ -1,4 +1,4 @@
-From 14f34d2b4d9cdc5c963169f0037f2d779bee69b6 Mon Sep 17 00:00:00 2001
+From 7829dc4e89c46d4c1e65ba0980ba2546b75ec74a 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 4f4c9773..0d7d1adf 100644
+index 87b17dc8..a00e688d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -181,8 +181,6 @@ public class BungeeCord extends ProxyServer
+@@ -182,8 +182,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.14.1
+2.14.3
 

BungeeCord-Patches/0013-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch

@@ -1,14 +1,14 @@
-From 3183b60a0e68f2ab100d18ed2789f9a8e37fe14b Mon Sep 17 00:00:00 2001
+From e630a01ad55d08e6d09d9eea39c21cb2c08356d2 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@optic.tv>
 Date: Mon, 6 Jul 2015 18:59:29 -0500
 Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit
 
 
 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 538b4b1c..82c3ec14 100644
+index a00e688d..6f1c3f68 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -313,6 +313,8 @@ public class BungeeCord extends ProxyServer
+@@ -315,6 +315,8 @@ public class BungeeCord extends ProxyServer
              new ServerBootstrap()
                      .channel( PipelineUtils.getServerChannel() )
                      .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!

BungeeCord-Patches/0016-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From 83a86a46fbdd858c96d2ffd434d415cae2f04621 Mon Sep 17 00:00:00 2001
+From 3b533fd77d76327101248aeb4bb6ccf4929dcb65 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 18:05:33 -0600
 Subject: [PATCH] Micro-optimizations
@@ -31,10 +31,10 @@ index 71a5a158..520ee315 100644
          if ( split.length == 0 )
          {
 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 82c3ec14..6b40faaa 100644
+index 6f1c3f68..7876f10a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -501,7 +501,9 @@ public class BungeeCord extends ProxyServer
+@@ -503,7 +503,9 @@ public class BungeeCord extends ProxyServer
          String translation = "<translation '" + name + "' missing>";
          try
          {

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

@@ -1,4 +1,4 @@
-From 98a9df1d1ca47ec3718f5ba34fe033ec3b36a39e Mon Sep 17 00:00:00 2001
+From f6c7a13ff0fc4cfcb825e54d82e9f9f0385c7fe9 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 6b40faaa..264554f5 100644
+index 7876f10a..0903dc5f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -110,7 +110,7 @@ public class BungeeCord extends ProxyServer
+@@ -111,7 +111,7 @@ public class BungeeCord extends ProxyServer
       */
      private ResourceBundle baseBundle;
      private ResourceBundle customBundle;
@@ -20,7 +20,7 @@ index 6b40faaa..264554f5 100644
      /**
       * locations.yml save thread.
       */
-@@ -244,7 +244,8 @@ public class BungeeCord extends ProxyServer
+@@ -246,7 +246,8 @@ public class BungeeCord extends ProxyServer
              ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
          }
  
@@ -30,7 +30,7 @@ index 6b40faaa..264554f5 100644
  
          File moduleDirectory = new File( "modules" );
          moduleManager.load( this, moduleDirectory );
-@@ -317,7 +318,7 @@ public class BungeeCord extends ProxyServer
+@@ -319,7 +320,7 @@ public class BungeeCord extends ProxyServer
                      .childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 )
                      .childAttr( PipelineUtils.LISTENER, info )
                      .childHandler( PipelineUtils.SERVER_CHILD )
@@ -39,7 +39,7 @@ index 6b40faaa..264554f5 100644
                      .localAddress( info.getHost() )
                      .bind().addListener( listener );
  
-@@ -338,7 +339,7 @@ public class BungeeCord extends ProxyServer
+@@ -340,7 +341,7 @@ public class BungeeCord extends ProxyServer
                          }
                      }
                  };
@@ -48,7 +48,7 @@ index 6b40faaa..264554f5 100644
              }
          }
      }
-@@ -429,12 +430,14 @@ public class BungeeCord extends ProxyServer
+@@ -431,12 +432,14 @@ public class BungeeCord extends ProxyServer
                  }
  
                  getLogger().info( "Closing IO threads" );

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

@@ -1,4 +1,4 @@
-From a54483172958d310e8b93bf838c9fc0b6b285674 Mon Sep 17 00:00:00 2001
+From 5ee7b32fa3c3171ded4bb8d10b47620d202c5f46 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Fri, 18 Mar 2016 10:53:24 -0700
 Subject: [PATCH] Better Decompression Sanity
@@ -58,5 +58,5 @@ index 71df1fd5..4882b8ed 100644
          if ( compressionThreshold == -1 )
          {
 -- 
-2.14.1
+2.14.3
 

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

@@ -1,4 +1,4 @@
-From deb0bcb1efc19636ac2be9f2a785abcfa20a7a83 Mon Sep 17 00:00:00 2001
+From 5e5fd31270af1cc6ef58f58f65688637a3d37a1d 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.
@@ -157,10 +157,10 @@ index b3ff750f..43d11cf2 100644
              private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase();
  
 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 264554f5..a7502730 100644
+index 0903dc5f..1807b67a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -577,10 +577,18 @@ public class BungeeCord extends ProxyServer
+@@ -579,10 +579,18 @@ public class BungeeCord extends ProxyServer
          return config.getServers();
      }
  

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

@@ -1,4 +1,4 @@
-From a22387e75ed2f41b9a5b4399ce234801e8b1a95d Mon Sep 17 00:00:00 2001
+From 7782b26a7752100381fe77f3f5c05241e111c237 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
@@ -59,10 +59,10 @@ index 68f25460..59835815 100644
  
      @Override
 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 a7502730..b67de209 100644
+index 1807b67a..c84389cd 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -626,7 +626,7 @@ public class BungeeCord extends ProxyServer
+@@ -628,7 +628,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getGameVersion()
      {

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

@@ -1,4 +1,4 @@
-From b091ce13789be1c1f5ef60c814bfd7221044ad49 Mon Sep 17 00:00:00 2001
+From 2ec3795f6c430ff2c933b566b224d17b5657bb2b Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@@ -249,7 +249,7 @@ index 00000000..d4a81199
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 8ab84091..d8c19a30 100644
+index 6b4c1606..b82ef30a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,7 @@
@@ -261,7 +261,7 @@ index 8ab84091..d8c19a30 100644
          <module>protocol</module>
          <module>proxy</module>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 1a5d036d..78326e6c 100644
+index dd8eab30..61886884 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -70,7 +70,7 @@
@@ -395,7 +395,7 @@ index 00000000..a8a94749
 +
 +}
 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 b67de209..0cba0076 100644
+index c84389cd..c71b7c4d 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;
@@ -406,7 +406,7 @@ index b67de209..0cba0076 100644
  import lombok.Getter;
  import lombok.Setter;
  import lombok.Synchronized;
-@@ -77,8 +76,6 @@ import net.md_5.bungee.compress.CompressFactory;
+@@ -78,8 +77,6 @@ import net.md_5.bungee.compress.CompressFactory;
  import net.md_5.bungee.conf.Configuration;
  import net.md_5.bungee.conf.YamlConfig;
  import net.md_5.bungee.forge.ForgeConstants;
@@ -415,7 +415,7 @@ index b67de209..0cba0076 100644
  import net.md_5.bungee.module.ModuleManager;
  import net.md_5.bungee.netty.PipelineUtils;
  import net.md_5.bungee.protocol.DefinedPacket;
-@@ -88,7 +85,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
+@@ -89,7 +86,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;
@@ -423,7 +423,7 @@ index b67de209..0cba0076 100644
  
  /**
   * Main BungeeCord proxy class.
-@@ -144,8 +140,12 @@ public class BungeeCord extends ProxyServer
+@@ -145,8 +141,12 @@ public class BungeeCord extends ProxyServer
      private final File pluginsFolder = new File( "plugins" );
      @Getter
      private final BungeeScheduler scheduler = new BungeeScheduler();
@@ -436,7 +436,7 @@ index b67de209..0cba0076 100644
      @Getter
      private final Logger logger;
      public final Gson gson = new GsonBuilder()
-@@ -190,6 +190,8 @@ public class BungeeCord extends ProxyServer
+@@ -191,6 +191,8 @@ public class BungeeCord extends ProxyServer
          }
          reloadMessages();
  
@@ -445,7 +445,7 @@ index b67de209..0cba0076 100644
          // This is a workaround for quite possibly the weirdest bug I have ever encountered in my life!
          // When jansi attempts to extract its natives, by default it tries to extract a specific version,
          // using the loading class's implementation version. Normally this works completely fine,
-@@ -207,6 +209,9 @@ public class BungeeCord extends ProxyServer
+@@ -209,6 +211,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 ) );

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

@@ -1,11 +1,11 @@
-From c04d240c0c773c3d8bd4553097394916c51578b3 Mon Sep 17 00:00:00 2001
+From 97f93928568ff18ab147bec87e21b7f606563881 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
 
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java b/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
-index fa507753..ca76793d 100644
+index fa507753..a13eba79 100644
 --- a/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
 +++ b/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
 @@ -10,6 +10,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
@@ -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 113752ad..64d898c7 100644
+index 9e501c00..c7a4bd2a 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
-@@ -536,7 +536,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -535,7 +535,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          };
  
          // fire login event
@@ -65,5 +65,5 @@ index 113752ad..64d898c7 100644
  
      @Override
 -- 
-2.14.0.windows.1
+2.14.3