Merge upstream

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

@@ -1,4 +1,4 @@
-From 7b85684874255cae79234bec39f375ea3f5e57d3 Mon Sep 17 00:00:00 2001
+From 207551ef6b7e99e5f4844b9e7fb8c693b925d85c 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 2b6c6995..f90bc370 100644
+index 5405a537..0d41645b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -179,7 +179,7 @@ public class BungeeCord extends ProxyServer
+@@ -188,7 +188,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 2b6c6995..f90bc370 100644
 
          System.setSecurityManager( new BungeeSecurityManager() );
 
-@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer
+@@ -479,7 +479,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {
@@ -114,5 +114,5 @@ index 408312fd..95590b6d 100644
              InetSocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.14.3
+2.16.1
 

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

@@ -1,4 +1,4 @@
-From 8bcbac6bb22e605d7e9bb751c74ba1ac2bef3373 Mon Sep 17 00:00:00 2001
+From 89660a3a2bdcfc95468d053c89a620dbd0626bed 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 f90bc370..06ceabb9 100644
+index 0d41645b..1144ec73 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 f90bc370..06ceabb9 100644
  import io.netty.bootstrap.ServerBootstrap;
  import io.netty.channel.Channel;
  import io.netty.channel.ChannelException;
-@@ -104,7 +105,7 @@ public class BungeeCord extends ProxyServer
+@@ -110,7 +111,7 @@ public class BungeeCord extends ProxyServer
       * Configuration.
       */
      @Getter
@@ -119,5 +119,5 @@ index 95590b6d..1019c307 100644
          if ( permissions.isEmpty() )
          {
 -- 
-2.14.3
+2.16.1
 

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

@@ -1,4 +1,4 @@
-From f3583f4a0d45342a59b462af34d68c93705ba8b3 Mon Sep 17 00:00:00 2001
+From deab52d855171f7f411835d801e6edc3ef5f343a 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 06ceabb9..87b17dc8 100644
+index 1144ec73..179e3a3a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -285,7 +285,9 @@ public class BungeeCord extends ProxyServer
+@@ -294,7 +294,9 @@ public class BungeeCord extends ProxyServer
                  }
              }
          }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@@ -82,5 +82,5 @@ index 95239878..e482e98c 100644
          // Connect to the website
          URLConnection connection;
 -- 
-2.14.3
+2.16.1
 

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

@@ -1,15 +1,15 @@
-From 7829dc4e89c46d4c1e65ba0980ba2546b75ec74a Mon Sep 17 00:00:00 2001
+From a4631983a6b2ef04c689ee10f1e9c3940f285d5d 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.
 
 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 87b17dc8..a00e688d 100644
+index 179e3a3a..c93607fd 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -182,8 +182,6 @@ public class BungeeCord extends ProxyServer
+@@ -191,8 +191,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.3
+2.16.1
 

BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch

@@ -1,4 +1,4 @@
-From 81d0178ac2014c4289c0511cd919afc02d9bfe85 Mon Sep 17 00:00:00 2001
+From 1424553c4cbf124a575ada58158b2bbdd6342572 Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Tue, 25 Oct 2016 12:23:07 -0400
 Subject: [PATCH] Add support for FML with IP Forwarding enabled
@@ -67,10 +67,10 @@ index 4a96a601..61c53b30 100644
          }
 
 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 4c828815..37479be3 100644
+index 67adfef9..48f2aa8e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -164,8 +164,12 @@ public final class UserConnection implements ProxiedPlayer
+@@ -165,8 +165,12 @@ public final class UserConnection implements ProxiedPlayer
 
          forgeClientHandler = new ForgeClientHandler( this );
 
@@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
       * The FML 1.8 handshake token.
       */
 -- 
-2.14.3
+2.16.1
 

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

@@ -1,14 +1,14 @@
-From e630a01ad55d08e6d09d9eea39c21cb2c08356d2 Mon Sep 17 00:00:00 2001
+From cb100cb895b975df9aac238f2739022e4de43079 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 a00e688d..6f1c3f68 100644
+index c93607fd..507db01f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -315,6 +315,8 @@ public class BungeeCord extends ProxyServer
+@@ -324,6 +324,8 @@ public class BungeeCord extends ProxyServer
              new ServerBootstrap()
                      .channel( PipelineUtils.getServerChannel() )
                      .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
@@ -18,5 +18,5 @@ index a00e688d..6f1c3f68 100644
                      .childHandler( PipelineUtils.SERVER_CHILD )
                      .group( eventLoops )
 -- 
-2.14.3
+2.16.1
 

BungeeCord-Patches/0016-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From 3b533fd77d76327101248aeb4bb6ccf4929dcb65 Mon Sep 17 00:00:00 2001
+From c001ff289470f54a0c30524af6df8c6be00c62fc 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 6f1c3f68..7876f10a 100644
+index 507db01f..fde98e27 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -503,7 +503,9 @@ public class BungeeCord extends ProxyServer
+@@ -512,7 +512,9 @@ public class BungeeCord extends ProxyServer
          String translation = "<translation '" + name + "' missing>";
          try
          {
@@ -46,10 +46,10 @@ index 6f1c3f68..7876f10a 100644
          {
          }
 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 37479be3..d1ec66c1 100644
+index 48f2aa8e..d9810c63 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -532,7 +532,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -538,7 +538,7 @@ public final class UserConnection implements ProxiedPlayer
      @Override
      public Locale getLocale()
      {
@@ -79,5 +79,5 @@ index 95b547b3..5829dda9 100644
              String subChannel = in.readUTF();
 
 -- 
-2.14.3
+2.16.1
 

BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch

@@ -1,4 +1,4 @@
-From 4911849bf46ae1005c2c9efbf0de31ef2a6869d0 Mon Sep 17 00:00:00 2001
+From 71374ababcec369da8b75d493e708767dbbef271 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -93,10 +93,10 @@ index 61c53b30..b29ee7c5 100644
 
          ch.write( BungeeCord.getInstance().registerChannels() );
 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 d1ec66c1..158dfb18 100644
+index d9810c63..5468144a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -70,6 +70,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -71,6 +71,7 @@ public final class UserConnection implements ProxiedPlayer
      @NonNull
      private final ProxyServer bungee;
      @NonNull

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

@@ -1,4 +1,4 @@
-From f6c7a13ff0fc4cfcb825e54d82e9f9f0385c7fe9 Mon Sep 17 00:00:00 2001
+From 54a03d0d14c69cdc40bbf9e07a75643f0725864a 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 7876f10a..0903dc5f 100644
+index fde98e27..40f28a12 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -111,7 +111,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 7876f10a..0903dc5f 100644
      /**
       * locations.yml save thread.
       */
-@@ -246,7 +246,8 @@ public class BungeeCord extends ProxyServer
+@@ -255,7 +255,8 @@ public class BungeeCord extends ProxyServer
              ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
          }
 
@@ -30,7 +30,7 @@ index 7876f10a..0903dc5f 100644
 
          File moduleDirectory = new File( "modules" );
          moduleManager.load( this, moduleDirectory );
-@@ -319,7 +320,7 @@ public class BungeeCord extends ProxyServer
+@@ -328,7 +329,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 7876f10a..0903dc5f 100644
                      .localAddress( info.getHost() )
                      .bind().addListener( listener );
 
-@@ -340,7 +341,7 @@ public class BungeeCord extends ProxyServer
+@@ -349,7 +350,7 @@ public class BungeeCord extends ProxyServer
                          }
                      }
                  };
@@ -48,7 +48,7 @@ index 7876f10a..0903dc5f 100644
              }
          }
      }
-@@ -431,12 +432,14 @@ public class BungeeCord extends ProxyServer
+@@ -440,12 +441,14 @@ public class BungeeCord extends ProxyServer
                  }
 
                  getLogger().info( "Closing IO threads" );
@@ -83,5 +83,5 @@ index 9756c09c..648cd273 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
                  .remoteAddress( getAddress() )
 -- 
-2.14.3
+2.16.1
 

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

@@ -1,4 +1,4 @@
-From 5e5fd31270af1cc6ef58f58f65688637a3d37a1d Mon Sep 17 00:00:00 2001
+From 0a3a3e40c649e188cf4aa5ff1d1fbcc028df9ab5 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.
@@ -126,7 +126,7 @@ index 11c5b685..1c011d08 100644
       * Gets the server info of a server.
       *
 diff --git a/config/src/main/java/net/md_5/bungee/config/Configuration.java b/config/src/main/java/net/md_5/bungee/config/Configuration.java
-index 967a1b2a..08aa6981 100644
+index 262b29c8..d7ed3e11 100644
 --- a/config/src/main/java/net/md_5/bungee/config/Configuration.java
 +++ b/config/src/main/java/net/md_5/bungee/config/Configuration.java
 @@ -44,6 +44,13 @@ public final class Configuration
@@ -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 0903dc5f..1807b67a 100644
+index 40f28a12..f14821b4 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -579,10 +579,18 @@ public class BungeeCord extends ProxyServer
+@@ -588,10 +588,18 @@ public class BungeeCord extends ProxyServer
          return config.getServers();
      }
 
@@ -298,5 +298,5 @@ index d131c02c..a755121a 100644
 +    // Waterfall end
  }
 -- 
-2.14.3
+2.16.1
 

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

@@ -1,4 +1,4 @@
-From 7782b26a7752100381fe77f3f5c05241e111c237 Mon Sep 17 00:00:00 2001
+From ff7fc3cfd40c91a22308b2852a9b41b2cf2c1ff3 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 1807b67a..c84389cd 100644
+index f14821b4..064a7672 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -628,7 +628,7 @@ public class BungeeCord extends ProxyServer
+@@ -637,7 +637,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getGameVersion()
      {
@@ -72,5 +72,5 @@ index 1807b67a..c84389cd 100644
 
      @Override
 -- 
-2.14.3
+2.16.1