Merge upstream

BungeeCord

@@ -1 +1 @@
-Subproject commit 2356dbcae801c13b60fffdd184d2a9946960d92a
+Subproject commit 76dc32ee3259c9d52ce71467c926c055693f5e92

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

@@ -1,4 +1,4 @@
-From e479146e89c47110e3a7d39ecbf02bbea4f56fad Mon Sep 17 00:00:00 2001
+From 3dbc0055fbf1e0ea2fbfc5118e8befded266a048 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,7 +53,7 @@ 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 77873239..5569951d 100644
+index 5ca4fe8a..90af65fa 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -188,7 +188,7 @@ public class BungeeCord extends ProxyServer
@@ -65,7 +65,7 @@ index 77873239..5569951d 100644
  
          System.setSecurityManager( new BungeeSecurityManager() );
  
-@@ -484,7 +484,7 @@ public class BungeeCord extends ProxyServer
+@@ -483,7 +483,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.17.0.windows.1
+2.17.1
 

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

@@ -1,4 +1,4 @@
-From 41bf96f33293ee1703053874c7b3adba3100258c Mon Sep 17 00:00:00 2001
+From e900c3b4c484292f81e4ab1e34e7fac515f98a80 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 30613a06..56bbd3c4 100644
+index 0a555864..eb816dce 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -299,7 +299,9 @@ public class BungeeCord extends ProxyServer
+@@ -298,7 +298,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.17.0.windows.1
+2.17.1
 

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

@@ -1,14 +1,14 @@
-From db66e7b6fb17dd035a59211fbba9c1850ed0c32c Mon Sep 17 00:00:00 2001
+From b0f49e80108cc2df98f65dc8b19b78305b551c85 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 8458be34..fb751232 100644
+index 451a93d0..bb162e0f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -329,6 +329,8 @@ public class BungeeCord extends ProxyServer
+@@ -328,6 +328,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 8458be34..fb751232 100644
                      .childHandler( PipelineUtils.SERVER_CHILD )
                      .group( eventLoops )
 -- 
-2.17.0.windows.1
+2.17.1
 

BungeeCord-Patches/0016-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From 24dd867b9a796cd9fe22f66fdf2ae6215727ab66 Mon Sep 17 00:00:00 2001
+From 7320250bed10e66cd09a696a6c6f482bee2f5160 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
@@ -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 fb751232..eff7a89c 100644
+index bb162e0f..09652575 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -517,7 +517,9 @@ public class BungeeCord extends ProxyServer
+@@ -516,7 +516,9 @@ public class BungeeCord extends ProxyServer
          String translation = "<translation '" + name + "' missing>";
          try
          {
@@ -79,5 +79,5 @@ index 9ea61319..565e6b0e 100644
              String subChannel = in.readUTF();
  
 -- 
-2.17.0.windows.1
+2.17.1
 

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

@@ -1,4 +1,4 @@
-From 3afd7ec28bfd625e5aaf366bbc2d52ae088a1eae Mon Sep 17 00:00:00 2001
+From 80ee547ecc6cbbb97d20096758ba66f39ed19aef 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,7 +8,7 @@ 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 eff7a89c..adb15d5b 100644
+index 09652575..29b3ff11 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
@@ -20,7 +20,7 @@ index eff7a89c..adb15d5b 100644
      /**
       * locations.yml save thread.
       */
-@@ -255,7 +255,8 @@ public class BungeeCord extends ProxyServer
+@@ -254,7 +254,8 @@ public class BungeeCord extends ProxyServer
              ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
          }
  
@@ -30,7 +30,7 @@ index eff7a89c..adb15d5b 100644
  
          File moduleDirectory = new File( "modules" );
          moduleManager.load( this, moduleDirectory );
-@@ -333,7 +334,7 @@ public class BungeeCord extends ProxyServer
+@@ -332,7 +333,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 eff7a89c..adb15d5b 100644
                      .localAddress( info.getHost() )
                      .bind().addListener( listener );
  
-@@ -354,7 +355,7 @@ public class BungeeCord extends ProxyServer
+@@ -353,7 +354,7 @@ public class BungeeCord extends ProxyServer
                          }
                      }
                  };
@@ -48,7 +48,7 @@ index eff7a89c..adb15d5b 100644
              }
          }
      }
-@@ -445,12 +446,14 @@ public class BungeeCord extends ProxyServer
+@@ -444,12 +445,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.17.0.windows.1
+2.17.1
 

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

@@ -1,4 +1,4 @@
-From 985a9137271f3307588d1272278749fca0494e50 Mon Sep 17 00:00:00 2001
+From cd8c407ecee53a9083006fbd23882cf05df05091 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 416c54e3..920b9b36 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 adb15d5b..dc652415 100644
+index 29b3ff11..b6f0e459 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -593,10 +593,18 @@ public class BungeeCord extends ProxyServer
+@@ -592,10 +592,18 @@ public class BungeeCord extends ProxyServer
          return config.getServers();
      }
  
@@ -298,5 +298,5 @@ index 3a73a870..d3f0b2d8 100644
 +    // Waterfall end
  }
 -- 
-2.17.0.windows.1
+2.17.1
 

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

@@ -1,4 +1,4 @@
-From 656e72bfea6ec93572fedf068571dd385d9e555e Mon Sep 17 00:00:00 2001
+From 9a18f1dc563de271ce89c5fd79d1a70781354e4a 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 dc652415..f140f026 100644
+index b6f0e459..788e6687 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -642,7 +642,7 @@ public class BungeeCord extends ProxyServer
+@@ -641,7 +641,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getGameVersion()
      {
@@ -72,5 +72,5 @@ index dc652415..f140f026 100644
  
      @Override
 -- 
-2.17.0.windows.1
+2.17.1
 

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

@@ -1,14 +1,14 @@
-From a5fba8faeafb66c208822e5929c87a9601f5c7a7 Mon Sep 17 00:00:00 2001
+From 13717faeafe2c5c4fe644eb9c4e6b041b4b324b1 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 bdb05826..07e46026 100644
+index bba7a0e7..d5b3bd3d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -277,8 +277,6 @@ public class BungeeCord extends ProxyServer
+@@ -276,8 +276,6 @@ public class BungeeCord extends ProxyServer
              registerChannel( ForgeConstants.FML_TAG );
              registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
              registerChannel( ForgeConstants.FORGE_REGISTER );
@@ -31,5 +31,5 @@ index d3f0b2d8..242535d0 100644
      @Synchronized("serversLock") // Waterfall
      public void load()
 -- 
-2.17.0.windows.1
+2.17.1