diff --git a/BungeeCord b/BungeeCord
index 85ea4c1..4bb0fb6 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 85ea4c165b0a4de63e538b4b70abaa3734333e51
+Subproject commit 4bb0fb67a8ac75d9ceb8e8e815db3478b0cd4799
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 92f59c1..609f1bb 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From f0bf6c9420a842123293120ff1834cd3b6cca46a Mon Sep 17 00:00:00 2001
+From 5596cf8eeee5006b2584a5ab38bfbf78cc3912c7 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 19:33:31 +0200
 Subject: [PATCH] POM Changes
@@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
 - Deploy to papermc mvn repo
 
 diff --git a/api/pom.xml b/api/pom.xml
-index 30eef5dc..afc4e46e 100644
+index 5d782001..4b9e171d 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,42 +4,42 @@
@@ -483,7 +483,7 @@ index f11cad04..f8b549dc 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 55a01bea..9898507c 100644
+index ff92bf1e..32ef5311 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -578,7 +578,7 @@ index 55a01bea..9898507c 100644
  
      <properties>
          <build.number>unknown</build.number>
-         <netty.version>4.1.44.Final</netty.version>
+         <netty.version>4.1.45.Final</netty.version>
 -        <maven.compiler.source>1.7</maven.compiler.source>
 -        <maven.compiler.target>1.7</maven.compiler.target>
 +        <!-- Require Java 8 -->
@@ -855,5 +855,5 @@ index 9c7d6f5a..c3a29122 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.24.1
+2.25.0
 
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 305763c..51e0e02 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 a4ec73ffca3f4ebe747194d3d2925309f5165c56 Mon Sep 17 00:00:00 2001
+From c083e016c8b45b20eb2957e872533ae1eb2be1b3 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 1d36ff94..f367f66a 100644
+index 97568416..bea66b10 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -180,7 +180,7 @@ public class BungeeCord extends ProxyServer
+@@ -181,7 +181,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 1d36ff94..f367f66a 100644
  
          System.setSecurityManager( new BungeeSecurityManager() );
  
-@@ -491,7 +491,7 @@ public class BungeeCord extends ProxyServer
+@@ -494,7 +494,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {
@@ -40,7 +40,7 @@ index 1d36ff94..f367f66a 100644
  
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index 13f9812f..50195762 100644
+index 01ec0cae..4ba0ced5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 @@ -49,7 +49,7 @@ public class BungeeCordLauncher
@@ -88,7 +88,7 @@ index efe048c9..720d0c3b 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index 4cfb13c0..0ec6dabb 100644
+index bc7e3a0d..4c9a0054 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 @@ -213,7 +213,7 @@ public class YamlConfig implements ConfigurationAdapter
@@ -98,8 +98,8 @@ index 4cfb13c0..0ec6dabb 100644
 -            String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another BungeeCord - Forced Host", val ) );
 +            String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Waterfall - Forced Host", val ) );
              boolean restricted = get( "restricted", false, val );
-             InetSocketAddress address = Util.getAddr( addr );
+             SocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.21.0
+2.25.0
 
diff --git a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
index 93618ff..99fedda 100644
--- a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
+++ b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
@@ -1,4 +1,4 @@
-From 0128906f9d17aaa42fbdf64bbadf41770f2c87ca Mon Sep 17 00:00:00 2001
+From 53ca44cfd9e560819d2d24781b46e042ab580ba2 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 f210cc3f..a1320099 100644
+index bea66b10..d11c66bb 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 f210cc3f..a1320099 100644
  import io.netty.bootstrap.ServerBootstrap;
  import io.netty.channel.Channel;
  import io.netty.channel.ChannelException;
-@@ -109,7 +110,7 @@ public class BungeeCord extends ProxyServer
+@@ -110,7 +111,7 @@ public class BungeeCord extends ProxyServer
       * Configuration.
       */
      @Getter
@@ -76,7 +76,7 @@ index 49638c3a..886f3b4c 100644
  
      /**
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index 0ec6dabb..44011a96 100644
+index 4c9a0054..85c2a0b5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 @@ -44,10 +44,15 @@ public class YamlConfig implements ConfigurationAdapter
@@ -118,5 +118,5 @@ index 0ec6dabb..44011a96 100644
          if ( permissions == null )
          {
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0005-Disable-Metrics.patch b/BungeeCord-Patches/0005-Disable-Metrics.patch
index 5c21e50..d17d582 100644
--- a/BungeeCord-Patches/0005-Disable-Metrics.patch
+++ b/BungeeCord-Patches/0005-Disable-Metrics.patch
@@ -1,4 +1,4 @@
-From 1acf38d9b835459183bfc53539c3f56e3fab2dfa Mon Sep 17 00:00:00 2001
+From 157cff1f3abbcb6f9949a36102bc7e33583d6858 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 a1320099..5636e0c9 100644
+index d11c66bb..7fe9cad0 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -121,7 +121,7 @@ public class BungeeCord extends ProxyServer
+@@ -122,7 +122,7 @@ public class BungeeCord extends ProxyServer
       * locations.yml save thread.
       */
      private final Timer saveThread = new Timer( "Reconnect Saver" );
@@ -18,7 +18,7 @@ index a1320099..5636e0c9 100644
      /**
       * Server socket listener.
       */
-@@ -296,7 +296,7 @@ public class BungeeCord extends ProxyServer
+@@ -297,7 +297,7 @@ public class BungeeCord extends ProxyServer
                  }
              }
          }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@@ -27,7 +27,7 @@ index a1320099..5636e0c9 100644
      }
  
      public void startListeners()
-@@ -428,7 +428,7 @@ public class BungeeCord extends ProxyServer
+@@ -431,7 +431,7 @@ public class BungeeCord extends ProxyServer
                      reconnectHandler.close();
                  }
                  saveThread.cancel();
@@ -177,5 +177,5 @@ index eabf7573..00000000
 -    }
 -}
 -- 
-2.24.1
+2.25.0
 
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 fae844b..a26900c 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 1e75a4cda2d50082d6a1bbfc0badbb02ec8d3f2b Mon Sep 17 00:00:00 2001
+From bbda244687d39a056bce4c92bad5069eb9deb73e 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 57d82b66..ea11489b 100644
+index 7fe9cad0..8d13d49f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -183,8 +183,6 @@ public class BungeeCord extends ProxyServer
+@@ -184,8 +184,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.21.0
+2.25.0
 
diff --git a/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch b/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch
index e5124d3..a99c522 100644
--- a/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch
+++ b/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch
@@ -1,4 +1,4 @@
-From 9b21a2d835735b3dcafbdb4d89c8b0e66cd03cfd Mon Sep 17 00:00:00 2001
+From 45466510d9ff0749fafd8fb8cad280081dd4e911 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Don't access a ByteBuf's underlying array
@@ -43,10 +43,10 @@ index c01cf317..17e12655 100644
       * Allow this packet to be sent as an "extended" packet.
       */
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 552af4fc..91b8b41a 100644
+index 2ebfef5e..15b9e66c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -217,7 +217,7 @@ public class ServerConnector extends PacketHandler
+@@ -218,7 +218,7 @@ public class ServerConnector extends PacketHandler
  
              ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@@ -56,10 +56,10 @@ index 552af4fc..91b8b41a 100644
  
              user.setDimension( login.getDimension() );
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 63162de0..db39f52d 100644
+index b66712d2..a9b74334 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -256,7 +256,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -258,7 +258,7 @@ public class DownstreamBridge extends PacketHandler
  
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@@ -69,10 +69,10 @@ index 63162de0..db39f52d 100644
              // changes in the packet are ignored so we need to send it manually
              con.unsafe().sendPacket( pluginMessage );
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index f75ec97d..bc7a6d80 100644
+index 44e28846..c5f071f2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-@@ -43,9 +43,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
+@@ -48,9 +48,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
  public class PipelineUtils
  {
  
@@ -86,5 +86,5 @@ index f75ec97d..bc7a6d80 100644
      {
          @Override
 -- 
-2.21.0
+2.25.0
 
diff --git a/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch
index 5caf7ae..ce4c943 100644
--- a/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch
+++ b/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch
@@ -1,4 +1,4 @@
-From 13f04d202d0f756b106fec3b54cfa34e25c181d4 Mon Sep 17 00:00:00 2001
+From 5c0326d8bd07fa3561fec33132282c6f8c61cb88 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 14 Mar 2016 15:40:44 -0700
 Subject: [PATCH] Optimize uuid conversions
@@ -208,15 +208,16 @@ index 00000000..cc24dd35
 +}
 \ No newline at end of file
 diff --git a/api/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java
-index 5e5b53a7..684abf4c 100644
+index 31101f6b..77eb64a1 100644
 --- a/api/src/main/java/net/md_5/bungee/Util.java
 +++ b/api/src/main/java/net/md_5/bungee/Util.java
-@@ -2,11 +2,14 @@ package net.md_5.bungee;
- 
+@@ -3,12 +3,15 @@ package net.md_5.bungee;
  import com.google.common.base.Joiner;
  import com.google.common.primitives.UnsignedLongs;
+ import io.netty.channel.unix.DomainSocketAddress;
 +import com.google.common.primitives.Ints;
  import java.net.InetSocketAddress;
+ import java.net.SocketAddress;
  import java.net.URI;
  import java.net.URISyntaxException;
  import java.util.UUID;
@@ -226,7 +227,7 @@ index 5e5b53a7..684abf4c 100644
  /**
   * Series of utility classes to perform various operations.
   */
-@@ -48,7 +51,7 @@ public class Util
+@@ -65,7 +68,7 @@ public class Util
       */
      public static String hex(int i)
      {
@@ -249,10 +250,10 @@ index 88d36ad2..fc92a7b5 100644
      }
  
 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 18c9fa6f..47f2c876 100644
+index a53b113c..b9e42946 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
-@@ -619,7 +619,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -626,7 +626,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {
@@ -262,5 +263,5 @@ index 18c9fa6f..47f2c876 100644
  
      @Override
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch b/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch
index 7a61efc..3f00451 100644
--- a/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch
+++ b/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch
@@ -1,4 +1,4 @@
-From 1139b010c10e54335a955ccb9911f8376968c2ea Mon Sep 17 00:00:00 2001
+From 9471d10b02adc9528141cdc5fec98490e5ffe4a2 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
@@ -12,18 +12,18 @@ However, there is now at least one Forge coremod that intends to support IP forw
 No breaking changes occur due to this patch.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 74ae718a..cf397206 100644
+index 15b9e66c..e8fd2148 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
- import io.netty.buffer.ByteBuf;
+@@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf;
  import io.netty.buffer.ByteBufAllocator;
+ import java.net.InetSocketAddress;
  import java.util.Locale;
 +import java.util.Arrays; // Waterfall
  import java.util.Queue;
  import java.util.Set;
  import java.util.UUID;
-@@ -101,15 +102,39 @@ public class ServerConnector extends PacketHandler
+@@ -102,15 +103,39 @@ public class ServerConnector extends PacketHandler
              String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID();
  
              LoginResult profile = user.getPendingConnection().getLoginProfile();
@@ -67,10 +67,10 @@ index 74ae718a..cf397206 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 5b72efea..fb7141a1 100644
+index 3d7e9043..aebfdc16 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -165,8 +165,12 @@ public final class UserConnection implements ProxiedPlayer
+@@ -166,8 +166,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.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0015-Enable-TCP_NODELAY.patch b/BungeeCord-Patches/0015-Enable-TCP_NODELAY.patch
index 8a00ce6..38c50a9 100644
--- a/BungeeCord-Patches/0015-Enable-TCP_NODELAY.patch
+++ b/BungeeCord-Patches/0015-Enable-TCP_NODELAY.patch
@@ -1,4 +1,4 @@
-From d913cae4e3057567b2ddf147342de2ae3cdca2a1 Mon Sep 17 00:00:00 2001
+From 901946ee5647bc874fab86859c58b4ea6f4a1d83 Mon Sep 17 00:00:00 2001
 From: Harry <me@harry5573.uk>
 Date: Sun, 24 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Enable TCP_NODELAY.
@@ -6,10 +6,10 @@ Subject: [PATCH] Enable TCP_NODELAY.
 This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index a2af0a36..ba274eea 100644
+index c5f071f2..0c91f7ed 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-@@ -141,6 +141,7 @@ public class PipelineUtils
+@@ -160,6 +160,7 @@ public class PipelineUtils
              {
                  // IP_TOS is not supported (Windows XP / Windows Server 2003)
              }
@@ -18,5 +18,5 @@ index a2af0a36..ba274eea 100644
              ch.config().setWriteBufferWaterMark( MARK );
  
 -- 
-2.20.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0016-Micro-optimizations.patch b/BungeeCord-Patches/0016-Micro-optimizations.patch
index c40fa41..dc501d7 100644
--- a/BungeeCord-Patches/0016-Micro-optimizations.patch
+++ b/BungeeCord-Patches/0016-Micro-optimizations.patch
@@ -1,4 +1,4 @@
-From 7644bdb527293d3cb40d70759ec849c865ae44bf Mon Sep 17 00:00:00 2001
+From 2f4d0290d2a7b1a6d6d0ac802897d2209348e8f6 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
@@ -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 ea11489b..d14b8d3c 100644
+index 8d13d49f..5643684c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -520,7 +520,9 @@ public class BungeeCord extends ProxyServer
+@@ -523,7 +523,9 @@ public class BungeeCord extends ProxyServer
          String translation = "<translation '" + name + "' missing>";
          try
          {
@@ -23,10 +23,10 @@ index ea11489b..d14b8d3c 100644
          {
          }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index db39f52d..1911923c 100644
+index a9b74334..567b5b71 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -238,7 +238,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -240,7 +240,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(PluginMessage pluginMessage) throws Exception
      {
@@ -34,7 +34,7 @@ index db39f52d..1911923c 100644
          PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
  
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -265,6 +264,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -267,6 +266,7 @@ public class DownstreamBridge extends PacketHandler
  
          if ( pluginMessage.getTag().equals( "BungeeCord" ) )
          {
@@ -43,5 +43,5 @@ index db39f52d..1911923c 100644
              String subChannel = in.readUTF();
  
 -- 
-2.21.0
+2.25.0
 
diff --git a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
index 0439f0e..9c5dbbf 100644
--- a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
+++ b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
@@ -1,4 +1,4 @@
-From 3fe05ff7372f21618834a3299a012165bdfc4371 Mon Sep 17 00:00:00 2001
+From 54742637aa0b70247beb96d38797a1675fe63f3b 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
@@ -66,10 +66,10 @@ index 8c99ee85..31cbaa53 100644
                  throw new BadPacketException( "Packet with id " + id + " outside of range " );
              }
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index cf397206..8cdd3f98 100644
+index e8fd2148..e55d572a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -31,7 +31,9 @@ import net.md_5.bungee.forge.ForgeUtils;
+@@ -32,7 +32,9 @@ import net.md_5.bungee.forge.ForgeUtils;
  import net.md_5.bungee.netty.ChannelWrapper;
  import net.md_5.bungee.netty.HandlerBoss;
  import net.md_5.bungee.netty.PacketHandler;
@@ -79,7 +79,7 @@ index cf397206..8cdd3f98 100644
  import net.md_5.bungee.protocol.PacketWrapper;
  import net.md_5.bungee.protocol.Protocol;
  import net.md_5.bungee.protocol.ProtocolConstants;
-@@ -201,6 +203,12 @@ public class ServerConnector extends PacketHandler
+@@ -202,6 +204,12 @@ public class ServerConnector extends PacketHandler
  
          ServerConnection server = new ServerConnection( ch, target );
          ServerConnectedEvent event = new ServerConnectedEvent( user, server );
@@ -93,10 +93,10 @@ index cf397206..8cdd3f98 100644
  
          ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
 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 fb7141a1..4700d1d6 100644
+index aebfdc16..e245c3c0 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -71,6 +71,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -72,6 +72,7 @@ public final class UserConnection implements ProxiedPlayer
      @NonNull
      private final ProxyServer bungee;
      @NonNull
@@ -122,5 +122,5 @@ index 60e2889c..d87ceb57 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch b/BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch
index 315e1fb..da3334c 100644
--- a/BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch
+++ b/BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch
@@ -1,14 +1,14 @@
-From 5084ea690834f6ccf37c28f927d4345560b0896a Mon Sep 17 00:00:00 2001
+From a01374cdf7cd8a968e6f84ca92aaa27c10017113 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Fri, 12 Feb 2016 23:55:53 -0500
 Subject: [PATCH] Resolve sendData() deadlocks
 
 
 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 3ff3446b..f4c17cf4 100644
+index cab2c21b..3dab3422 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-@@ -107,19 +107,22 @@ public class BungeeServerInfo implements ServerInfo
+@@ -108,19 +108,22 @@ public class BungeeServerInfo implements ServerInfo
          Preconditions.checkNotNull( channel, "channel" );
          Preconditions.checkNotNull( data, "data" );
  
@@ -43,5 +43,5 @@ index 3ff3446b..f4c17cf4 100644
  
      @Override
 -- 
-2.20.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
index 5d136df..013429c 100644
--- a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
@@ -1,4 +1,4 @@
-From beefdd141a82e9b063c99873c993ef104d433d7a Mon Sep 17 00:00:00 2001
+From 0193f69ac34fca99f79151710e5b6e4b2f333495 Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Improve server list ping logging
@@ -7,10 +7,10 @@ This functionality of this patch was adopted upstream, however, this
 patch remains for a few misc improvements around here
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 8cdd3f98..84f74bfb 100644
+index e55d572a..281adc8c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -415,6 +415,6 @@ public class ServerConnector extends PacketHandler
+@@ -416,6 +416,6 @@ public class ServerConnector extends PacketHandler
      @Override
      public String toString()
      {
@@ -19,10 +19,10 @@ index 8cdd3f98..84f74bfb 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 1911923c..2eff743d 100644
+index 567b5b71..5401b7aa 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -597,6 +597,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -606,6 +606,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -31,15 +31,15 @@ index 1911923c..2eff743d 100644
      }
  }
 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 47f2c876..db0bdd53 100644
+index b9e42946..4e5c8a5c 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
-@@ -625,7 +625,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -632,7 +632,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {
--        return "[" + ( ( getName() != null ) ? getName() : getAddress() ) + "] <-> InitialHandler";
-+        return "[" + getAddress() + ( getName() != null ? "|" + getName() : "" ) + "] <-> InitialHandler";
+-        return "[" + ( ( getName() != null ) ? getName() : getSocketAddress() ) + "] <-> InitialHandler";
++        return "[" + getSocketAddress() + ( getName() != null ? "|" + getName() : "" ) + "] <-> InitialHandler";
      }
  
      @Override
@@ -56,5 +56,5 @@ index de916f6e..bdaee47e 100644
      }
  }
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0021-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0021-Add-a-property-to-accept-invalid-ping-packets.patch
index 3ccc8c8..b297ffc 100644
--- a/BungeeCord-Patches/0021-Add-a-property-to-accept-invalid-ping-packets.patch
+++ b/BungeeCord-Patches/0021-Add-a-property-to-accept-invalid-ping-packets.patch
@@ -1,4 +1,4 @@
-From 80a9e6ef520f65949b77f5809f561cc018a1f571 Mon Sep 17 00:00:00 2001
+From a800541bf9f9f2557aa559671bcde723c8d37395 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sun, 7 Feb 2016 00:01:19 -0700
 Subject: [PATCH] Add a property to accept invalid ping packets
@@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
 Fixes #23
 
 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 4731cb9d..6a193d6f 100644
+index 4e5c8a5c..6fc5cd18 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
-@@ -261,10 +261,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -262,10 +262,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          thisState = State.PING;
      }
  
@@ -29,5 +29,5 @@ index 4731cb9d..6a193d6f 100644
          disconnect( "" );
      }
 -- 
-2.21.0
+2.25.0
 
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 d96c2cc..d6a200d 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 29a2e6ae61bad08ef21653c2e655561896961a62 Mon Sep 17 00:00:00 2001
+From 6459c67045351f0b7216541572af29719bab1d15 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 d14b8d3c..83a300dc 100644
+index 5643684c..b18027e2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -116,7 +116,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 d14b8d3c..83a300dc 100644
      /**
       * locations.yml save thread.
       */
-@@ -252,7 +252,8 @@ public class BungeeCord extends ProxyServer
+@@ -253,7 +253,8 @@ public class BungeeCord extends ProxyServer
              ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
          }
  
@@ -30,16 +30,16 @@ index d14b8d3c..83a300dc 100644
  
          File moduleDirectory = new File( "modules" );
          moduleManager.load( this, moduleDirectory );
-@@ -332,7 +333,7 @@ public class BungeeCord extends ProxyServer
+@@ -333,7 +334,7 @@ public class BungeeCord extends ProxyServer
                      .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
                      .childAttr( PipelineUtils.LISTENER, info )
                      .childHandler( PipelineUtils.SERVER_CHILD )
 -                    .group( eventLoops )
 +                    .group( bossEventLoopGroup, workerEventLoopGroup )
-                     .localAddress( info.getHost() )
+                     .localAddress( info.getSocketAddress() )
                      .bind().addListener( listener );
  
-@@ -353,7 +354,7 @@ public class BungeeCord extends ProxyServer
+@@ -356,7 +357,7 @@ public class BungeeCord extends ProxyServer
                          }
                      }
                  };
@@ -48,7 +48,7 @@ index d14b8d3c..83a300dc 100644
              }
          }
      }
-@@ -448,12 +449,14 @@ public class BungeeCord extends ProxyServer
+@@ -451,12 +452,14 @@ public class BungeeCord extends ProxyServer
                  }
  
                  getLogger().info( "Closing IO threads" );
@@ -70,18 +70,18 @@ index d14b8d3c..83a300dc 100644
  
                  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 f4c17cf4..4c0637b9 100644
+index 3dab3422..8e86462c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
-@@ -151,7 +151,7 @@ public class BungeeServerInfo implements ServerInfo
+@@ -158,7 +158,7 @@ public class BungeeServerInfo implements ServerInfo
          };
          new Bootstrap()
-                 .channel( PipelineUtils.getChannel() )
+                 .channel( PipelineUtils.getChannel( socketAddress ) )
 -                .group( BungeeCord.getInstance().eventLoops )
 +                .group( BungeeCord.getInstance().workerEventLoopGroup )
                  .handler( PipelineUtils.BASE )
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
-                 .remoteAddress( getAddress() )
+                 .remoteAddress( socketAddress )
 -- 
-2.21.0
+2.25.0
 
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 41c1189..dbdf013 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 f585ad9a010ee4bdadc19786829c14ec5f58cc3b Mon Sep 17 00:00:00 2001
+From 23bafa3bee49774c0e57c0d8956237faa3e37bae 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.
@@ -109,10 +109,10 @@ index 89bf000b..69cbbf9b 100644
       * Does the server authenticate with Mojang.
       *
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
-index 490a0944..218ec45c 100644
+index 1f330bd2..a4011335 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
-@@ -95,9 +95,25 @@ public abstract class ProxyServer
+@@ -96,9 +96,25 @@ public abstract class ProxyServer
       * return a fresh map each time.
       *
       * @return all registered remote server destinations
@@ -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 9b461efa..69d60a5f 100644
+index b18027e2..d572ff28 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -596,10 +596,18 @@ public class BungeeCord extends ProxyServer
+@@ -599,10 +599,18 @@ public class BungeeCord extends ProxyServer
          return config.getServers();
      }
  
@@ -311,5 +311,5 @@ index 193d8bce..2ec6c23c 100644
 +    // Waterfall end
  }
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch
index d458ada..c9ce02a 100644
--- a/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch
+++ b/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch
@@ -1,4 +1,4 @@
-From bb190fef52bf84e2e51d6cfe63fafccdc025070b Mon Sep 17 00:00:00 2001
+From d360ae6416f837902eb7944b2a385424f793fbf1 Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@@ -62,10 +62,10 @@ index 0e1ef5c4..ee63732d 100644
      @Deprecated
      public String getKickReason()
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 251e8726..c2b1de82 100644
+index 281adc8c..dae9e294 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -338,7 +338,7 @@ public class ServerConnector extends PacketHandler
+@@ -339,7 +339,7 @@ public class ServerConnector extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = user.updateAndGetNextServer( target );
@@ -75,7 +75,7 @@ index 251e8726..c2b1de82 100644
          {
              // Pre cancel the event if we are going to try another server
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 2eff743d..034040a0 100644
+index 5401b7aa..b5f3999f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 @@ -12,6 +12,7 @@ import com.mojang.brigadier.context.StringRange;
@@ -86,7 +86,7 @@ index 2eff743d..034040a0 100644
  import io.netty.buffer.ByteBuf;
  import io.netty.buffer.ByteBufAllocator;
  import io.netty.buffer.Unpooled;
-@@ -75,16 +76,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -77,16 +78,19 @@ public class DownstreamBridge extends PacketHandler
              return;
          }
  
@@ -111,7 +111,7 @@ index 2eff743d..034040a0 100644
      }
  
      @Override
-@@ -99,7 +103,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -101,7 +105,19 @@ public class DownstreamBridge extends PacketHandler
  
          if ( !server.isObsolete() )
          {
@@ -132,7 +132,7 @@ index 2eff743d..034040a0 100644
          }
  
          ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -481,7 +497,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -490,7 +506,11 @@ public class DownstreamBridge extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@@ -146,5 +146,5 @@ index 2eff743d..034040a0 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.24.0
+2.25.0
 
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 ef04940..d8cf1f6 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 6952c252c0b236b01aacc624bd2845ff554780e9 Mon Sep 17 00:00:00 2001
+From 26998b60f3d214c2f7f3a3eb29c8f19dab507c18 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 69d60a5f..46720458 100644
+index d572ff28..8b719c3c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -650,7 +650,7 @@ public class BungeeCord extends ProxyServer
+@@ -653,7 +653,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getGameVersion()
      {
@@ -79,5 +79,5 @@ index 69d60a5f..46720458 100644
  
      @Override
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch
index 5a9bc38..3b6bd7e 100644
--- a/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch
+++ b/BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch
@@ -1,4 +1,4 @@
-From 5bed49892c75624caa565d253eafd92161c2b29a Mon Sep 17 00:00:00 2001
+From 2b9371eea3da4a2600ab3e6e2811b2fc28b2a257 Mon Sep 17 00:00:00 2001
 From: Ichbinjoe <joe@ibj.io>
 Date: Sat, 16 Jul 2016 20:44:01 -0400
 Subject: [PATCH] Add timeout variant to connect methods
@@ -75,10 +75,10 @@ index 867e4428..f7459860 100644
       * Connects / transfers this user to the specified connection, gracefully
       * closing the current one. Depending on the implementation, this method
 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 4700d1d6..7e4b375a 100644
+index e245c3c0..a52e15eb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -256,9 +256,20 @@ public final class UserConnection implements ProxiedPlayer
+@@ -257,9 +257,20 @@ public final class UserConnection implements ProxiedPlayer
  
      public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
      {
@@ -99,7 +99,7 @@ index 4700d1d6..7e4b375a 100644
          if ( callback != null )
          {
              // Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
-@@ -352,7 +363,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -353,7 +364,7 @@ public final class UserConnection implements ProxiedPlayer
                      if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
                      {
                          sendMessage( bungee.getTranslation( "fallback_lobby" ) );
@@ -109,5 +109,5 @@ index 4700d1d6..7e4b375a 100644
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch b/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch
index eb56b21..d20f5c0 100644
--- a/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch
+++ b/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch
@@ -1,4 +1,4 @@
-From 816fd124a3b3bbc135b5c5533bd80b7a989b62d1 Mon Sep 17 00:00:00 2001
+From 6b9831e144e5d6b4653db345368a14b6b792dd1e Mon Sep 17 00:00:00 2001
 From: Aaron Hill <aa1ronham@gmail.com>
 Date: Thu, 15 Sep 2016 22:38:37 +0200
 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@@ -169,7 +169,7 @@ index 00000000..7ed2dc3a
 +    }
 +}
 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 7e4b375a..2b33e722 100644
+index a52e15eb..589e22f5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -1,7 +1,9 @@
@@ -182,7 +182,7 @@ index 7e4b375a..2b33e722 100644
  import io.netty.bootstrap.Bootstrap;
  import io.netty.channel.Channel;
  import io.netty.channel.ChannelFuture;
-@@ -126,6 +128,10 @@ public final class UserConnection implements ProxiedPlayer
+@@ -127,6 +129,10 @@ public final class UserConnection implements ProxiedPlayer
      private final Scoreboard serverSentScoreboard = new Scoreboard();
      @Getter
      private final Collection<UUID> sentBossBars = new HashSet<>();
@@ -194,10 +194,10 @@ index 7e4b375a..2b33e722 100644
      @Getter
      private String displayName;
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 034040a0..fd14f518 100644
+index b5f3999f..708088f3 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -47,6 +47,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
+@@ -49,6 +49,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
  import net.md_5.bungee.protocol.ProtocolConstants;
  import net.md_5.bungee.protocol.packet.BossBar;
  import net.md_5.bungee.protocol.packet.Commands;
@@ -206,7 +206,7 @@ index 034040a0..fd14f518 100644
  import net.md_5.bungee.protocol.packet.KeepAlive;
  import net.md_5.bungee.protocol.packet.Kick;
  import net.md_5.bungee.protocol.packet.PlayerListItem;
-@@ -582,6 +584,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -591,6 +593,32 @@ public class DownstreamBridge extends PacketHandler
          }
      }
  
@@ -277,5 +277,5 @@ index d15044f4..bea2bbff 100644
       * Sends the server mod list to the client, or stores it for sending later.
       *
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch b/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch
index c859018..1e2d94b 100644
--- a/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch
+++ b/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch
@@ -1,4 +1,4 @@
-From e07ab170b66d0c97f45a071d1edcd2dc915e3adb Mon Sep 17 00:00:00 2001
+From 0e434adbf5617dd8337126ecafe64c9202488d63 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 03:13:03 -0500
 Subject: [PATCH] Optionally use async Netty DNS resolver
@@ -80,7 +80,7 @@ index 111404fb..ef44d334 100644
      public int getTabThrottle() {
          return tabThrottle;
 diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
-index f95d5b6f..6b44b37e 100644
+index e0c52f21..37337429 100644
 --- a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
 +++ b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
 @@ -28,6 +28,10 @@ public class HttpClient
@@ -129,10 +129,11 @@ index f95d5b6f..6b44b37e 100644
  
          ChannelFutureListener future = new ChannelFutureListener()
          {
-@@ -92,7 +98,39 @@ public class HttpClient
+@@ -92,7 +98,40 @@ public class HttpClient
              }
          };
  
++
 +        // Waterfall Start - Optionally use Netty's async DNS Resolver
 +        if (net.md_5.bungee.api.ProxyServer.getInstance().getConfig().isUseNettyDnsResolver()) {
 +            getWithNettyResolver(eventLoop, uri, port, future, callback, ssl);
@@ -145,7 +146,7 @@ index f95d5b6f..6b44b37e 100644
 +
 +    private static void getWithNettyResolver(EventLoop eventLoop, URI uri, int port, ChannelFutureListener future, Callback<String> callback, boolean ssl) {
 +        java.net.InetSocketAddress address = java.net.InetSocketAddress.createUnresolved(uri.getHost(), port);
-+        new Bootstrap().channel( PipelineUtils.getChannel() ).group( eventLoop ).handler( new HttpInitializer( callback, ssl, uri.getHost(), port ) ).
++        new Bootstrap().channel( PipelineUtils.getChannel( null ) ).group( eventLoop ).handler( new HttpInitializer( callback, ssl, uri.getHost(), port ) ).
 +                option( ChannelOption.CONNECT_TIMEOUT_MILLIS, TIMEOUT ).resolver(dnsResolverGroup).remoteAddress( address ).connect().addListener( future );
 +    }
 +
@@ -164,24 +165,11 @@ index f95d5b6f..6b44b37e 100644
 +            }
 +            addressCache.put( uri.getHost(), inetHost );
 +        }
-         new Bootstrap().channel( PipelineUtils.getChannel() ).group( eventLoop ).handler( new HttpInitializer( callback, ssl, uri.getHost(), port ) ).
+         new Bootstrap().channel( PipelineUtils.getChannel( null ) ).group( eventLoop ).handler( new HttpInitializer( callback, ssl, uri.getHost(), port ) ).
                  option( ChannelOption.CONNECT_TIMEOUT_MILLIS, TIMEOUT ).remoteAddress( inetHost, port ).connect().addListener( future );
      }
 +    // Waterfall End
  }
-diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index 6c418567..23241d68 100644
---- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-@@ -119,7 +119,7 @@ public class PipelineUtils
-         return epoll ? EpollSocketChannel.class : NioSocketChannel.class;
-     }
- 
--    public static Class<? extends Channel> getDatagramChannel()
-+    public static Class<? extends io.netty.channel.socket.DatagramChannel> getDatagramChannel() // Waterfall - change to DatagramChannel
-     {
-         return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
-     }
 -- 
-2.24.1
+2.25.0
 
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 739d22c..45d5964 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 1c2839c00d336d4f0140b5f1bbc59b45c61f1a1e Mon Sep 17 00:00:00 2001
+From 58d84e502354fbf7ba5085a92c1dffc0ee8db8cc 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..93ce3b14
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 5d5563a0..a89472eb 100644
+index 32ef5311..b8f1d94f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,7 @@
@@ -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 083bc177..c4f45964 100644
+index 8b719c3c..ce93fa50 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -44,7 +44,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
+@@ -45,7 +45,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 083bc177..c4f45964 100644
  import lombok.Getter;
  import lombok.Setter;
  import lombok.Synchronized;
-@@ -77,14 +76,11 @@ import net.md_5.bungee.command.CommandEnd;
+@@ -78,14 +77,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 083bc177..c4f45964 100644
  import net.md_5.bungee.module.ModuleManager;
  import net.md_5.bungee.netty.PipelineUtils;
  import net.md_5.bungee.protocol.DefinedPacket;
-@@ -94,7 +90,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
+@@ -95,7 +91,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 083bc177..c4f45964 100644
  
  /**
   * Main BungeeCord proxy class.
-@@ -150,8 +145,12 @@ public class BungeeCord extends ProxyServer
+@@ -151,8 +146,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 083bc177..c4f45964 100644
      @Getter
      private final Logger logger;
      public final Gson gson = new GsonBuilder()
-@@ -202,6 +201,8 @@ public class BungeeCord extends ProxyServer
+@@ -203,6 +202,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 083bc177..c4f45964 100644
          AnsiConsole.systemInstall();
          consoleReader = new ConsoleReader();
          consoleReader.setExpandEvents( false );
-@@ -210,6 +211,9 @@ public class BungeeCord extends ProxyServer
+@@ -211,6 +212,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 ) );
@@ -458,5 +458,5 @@ index 10366c88..8c5cc949 100644
          }
  
 -- 
-2.24.0
+2.25.0
 
diff --git a/BungeeCord-Patches/0039-Allow-plugins-to-use-SLF4J-for-logging.patch b/BungeeCord-Patches/0039-Allow-plugins-to-use-SLF4J-for-logging.patch
index 5d44f00..8197dc9 100644
--- a/BungeeCord-Patches/0039-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/BungeeCord-Patches/0039-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -1,15 +1,15 @@
-From 1558f727fd65e501a94f0c7f4db134465514d54f Mon Sep 17 00:00:00 2001
+From 4aecdf4068b45c1ffc7c78aaf720e30e63fce926 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:15:09 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
 
 
 diff --git a/api/pom.xml b/api/pom.xml
-index f0348e13..b79d7ed6 100644
+index 4b9e171d..2380a5fd 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
-@@ -43,5 +43,12 @@
-             <version>${project.version}</version>
+@@ -49,5 +49,12 @@
+             <version>${netty.version}</version>
              <scope>compile</scope>
          </dependency>
 +
@@ -39,7 +39,7 @@ index e85b4914..2e5ae4fb 100644
       * Called when the plugin has just been loaded. Most of the proxy will not
       * be initialized, so only use it for registering
 diff --git a/log4j/pom.xml b/log4j/pom.xml
-index f019aaaf..75dab185 100644
+index a044119e..f5267567 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
 @@ -38,6 +38,12 @@
@@ -56,5 +56,5 @@ index f019aaaf..75dab185 100644
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.24.0
+2.25.0
 
diff --git a/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch b/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
index 15dc078..3c7d214 100644
--- a/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
+++ b/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
@@ -1,4 +1,4 @@
-From 2ac8cface993f8c6c7cf4e8882a6d85a89e78255 Mon Sep 17 00:00:00 2001
+From 6296caeeabc735ff1c5e0d11559f309b9cbce6f7 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
@@ -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 df4b7d9a..376ae366 100644
+index 6fc5cd18..ed9643c1 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
-@@ -545,7 +545,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -546,7 +546,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          };
  
          // fire login event
@@ -65,5 +65,5 @@ index df4b7d9a..376ae366 100644
  
      @Override
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch b/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch
index 1f4ae12..63e2248 100644
--- a/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch
+++ b/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch
@@ -1,4 +1,4 @@
-From 775c5214d00b2694364dd26fcab216338b0e4bfa Mon Sep 17 00:00:00 2001
+From d419c5a094b5505c8805014c57af310fbe6d3ef7 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Thu, 8 Feb 2018 19:10:52 +0100
 Subject: [PATCH] Optionally log InitialHandler connections
@@ -61,10 +61,10 @@ index ef44d334..4ff8da6d 100644
      public String getGameVersion() {
          return gameVersion;
 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 376ae366..8e637718 100644
+index ed9643c1..8e1b9a19 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
-@@ -315,7 +315,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -316,7 +316,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                  break;
              case 2:
                  // Login
@@ -77,5 +77,5 @@ index 376ae366..8e637718 100644
                  ch.setProtocol( Protocol.LOGIN );
  
 -- 
-2.24.1
+2.25.0
 
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 8d5d6f4..619410c 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 e46ca84dfcda26de04ccdd61a0707452ab704768 Mon Sep 17 00:00:00 2001
+From 71b98239c7ec267549a5fb17f3f4b22b1ae0a3df 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 c4f45964..6ae18f2c 100644
+index ce93fa50..c7ac1735 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -274,8 +274,6 @@ public class BungeeCord extends ProxyServer
+@@ -275,8 +275,6 @@ public class BungeeCord extends ProxyServer
              registerChannel( ForgeConstants.FML_TAG );
              registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
              registerChannel( ForgeConstants.FORGE_REGISTER );
@@ -31,5 +31,5 @@ index 2ec6c23c..5841cf63 100644
      @Synchronized("serversLock") // Waterfall
      public void load()
 -- 
-2.24.0
+2.25.0
 
diff --git a/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
index 625e92b..bd8217b 100644
--- a/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
+++ b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
@@ -1,4 +1,4 @@
-From ab161819def12b90ea804eff66cb3826d1be3744 Mon Sep 17 00:00:00 2001
+From 4111e1762ca8665c34dc1837c277dbd0b2f68be1 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 14 Jan 2019 03:35:21 +0000
 Subject: [PATCH] Provide an option to disable entity metadata rewriting
@@ -57,10 +57,10 @@ index 4ff8da6d..e860214f 100644
 +    }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 7aa792a2..00cd477f 100644
+index dae9e294..139c4f09 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -226,7 +226,7 @@ public class ServerConnector extends PacketHandler
+@@ -227,7 +227,7 @@ public class ServerConnector extends PacketHandler
              ch.write( message );
          }
  
@@ -69,7 +69,7 @@ index 7aa792a2..00cd477f 100644
          {
              ch.write( user.getSettings() );
          }
-@@ -260,6 +260,7 @@ public class ServerConnector extends PacketHandler
+@@ -261,6 +261,7 @@ public class ServerConnector extends PacketHandler
              user.getTabListHandler().onServerChange();
  
              Scoreboard serverScoreboard = user.getServerSentScoreboard();
@@ -77,7 +77,7 @@ index 7aa792a2..00cd477f 100644
              for ( Objective objective : serverScoreboard.getObjectives() )
              {
                  user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) );
-@@ -272,6 +273,7 @@ public class ServerConnector extends PacketHandler
+@@ -273,6 +274,7 @@ public class ServerConnector extends PacketHandler
              {
                  user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) );
              }
@@ -85,7 +85,7 @@ index 7aa792a2..00cd477f 100644
              serverScoreboard.clear();
  
              for ( UUID bossbar : user.getSentBossBars() )
-@@ -285,12 +287,33 @@ public class ServerConnector extends PacketHandler
+@@ -286,12 +288,33 @@ public class ServerConnector extends PacketHandler
              user.unsafe().sendPacket( new EntityStatus( user.getClientEntityId(), login.isReducedDebugInfo() ? EntityStatus.DEBUG_INFO_REDUCED : EntityStatus.DEBUG_INFO_NORMAL ) );
  
              user.setDimensionChange( true );
@@ -121,10 +121,10 @@ index 7aa792a2..00cd477f 100644
              if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
              {
 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 2b33e722..b4cbc3f3 100644
+index 589e22f5..e9284882 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -741,4 +741,10 @@ public final class UserConnection implements ProxiedPlayer
+@@ -748,4 +748,10 @@ public final class UserConnection implements ProxiedPlayer
      {
          return serverSentScoreboard;
      }
@@ -136,10 +136,10 @@ index 2b33e722..b4cbc3f3 100644
 +    // Waterfall end
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index fd14f518..fba84905 100644
+index 708088f3..fe27b406 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -588,6 +588,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -597,6 +597,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(EntityEffect entityEffect) throws Exception
      {
@@ -147,7 +147,7 @@ index fd14f518..fba84905 100644
          // Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
          // condition on the client.
          if (this.con.getForgeClientHandler().isForgeUser() && !this.con.getForgeClientHandler().isHandshakeComplete()) {
-@@ -599,6 +600,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -608,6 +609,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(EntityRemoveEffect removeEffect) throws Exception
      {
@@ -232,5 +232,5 @@ index 00000000..cb81d1dd
 +// Waterfall end
 \ No newline at end of file
 -- 
-2.24.1
+2.25.0
 
diff --git a/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch b/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch
index aee1587..2fa01f8 100644
--- a/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch
+++ b/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch
@@ -1,4 +1,4 @@
-From db8ebffad5c5672869f7f1401e525683b4e30f40 Mon Sep 17 00:00:00 2001
+From e4a5ec61f04fb08b1d63d9c673b9e9b38440afe6 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 14 Mar 2019 07:44:06 +0000
 Subject: [PATCH] Add ProxyDefineCommandsEvent
@@ -54,10 +54,10 @@ index 00000000..1fd4fc90
 +
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index fba84905..1f8a2439 100644
+index fe27b406..72133370 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -12,14 +12,17 @@ import com.mojang.brigadier.context.StringRange;
+@@ -12,7 +12,8 @@ import com.mojang.brigadier.context.StringRange;
  import com.mojang.brigadier.suggestion.Suggestion;
  import com.mojang.brigadier.suggestion.Suggestions;
  import com.mojang.brigadier.tree.LiteralCommandNode;
@@ -67,7 +67,9 @@ index fba84905..1f8a2439 100644
  import io.netty.buffer.ByteBuf;
  import io.netty.buffer.ByteBufAllocator;
  import io.netty.buffer.Unpooled;
+@@ -20,8 +21,10 @@ import io.netty.channel.unix.DomainSocketAddress;
  import java.io.DataInput;
+ import java.net.InetSocketAddress;
  import java.util.ArrayList;
 +import java.util.HashMap; // Waterfall
  import java.util.List;
@@ -76,7 +78,7 @@ index fba84905..1f8a2439 100644
  import lombok.RequiredArgsConstructor;
  import net.md_5.bungee.ServerConnection;
  import net.md_5.bungee.UserConnection;
-@@ -623,9 +626,25 @@ public class DownstreamBridge extends PacketHandler
+@@ -632,9 +635,25 @@ public class DownstreamBridge extends PacketHandler
      {
          boolean modified = false;
  
@@ -105,5 +107,5 @@ index fba84905..1f8a2439 100644
                  LiteralCommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() )
                          .then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
 -- 
-2.24.0
+2.25.0
 
diff --git a/BungeeCord-Patches/0055-ConnectionInitEvent.patch b/BungeeCord-Patches/0055-ConnectionInitEvent.patch
index 9b1f632..8fb0056 100644
--- a/BungeeCord-Patches/0055-ConnectionInitEvent.patch
+++ b/BungeeCord-Patches/0055-ConnectionInitEvent.patch
@@ -1,4 +1,4 @@
-From b61bb662bb822884c42a5f7777a22a7196bcd1ee Mon Sep 17 00:00:00 2001
+From 3fff0a06f93a7b1882fa1a6563889697270cec0a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 2 Dec 2019 11:35:17 +0000
 Subject: [PATCH] ConnectionInitEvent
@@ -6,10 +6,10 @@ Subject: [PATCH] ConnectionInitEvent
 
 diff --git a/api/src/main/java/io/github/waterfallmc/waterfall/event/ConnectionInitEvent.java b/api/src/main/java/io/github/waterfallmc/waterfall/event/ConnectionInitEvent.java
 new file mode 100644
-index 00000000..509b76a3
+index 00000000..e884eac8
 --- /dev/null
 +++ b/api/src/main/java/io/github/waterfallmc/waterfall/event/ConnectionInitEvent.java
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,52 @@
 +package io.github.waterfallmc.waterfall.event;
 +
 +import net.md_5.bungee.api.Callback;
@@ -17,6 +17,7 @@ index 00000000..509b76a3
 +import net.md_5.bungee.api.plugin.Cancellable;
 +
 +import java.net.InetSocketAddress;
++import java.net.SocketAddress;
 +
 +import lombok.ToString;
 +
@@ -27,10 +28,10 @@ index 00000000..509b76a3
 +@ToString
 +public class ConnectionInitEvent extends AsyncEvent<ConnectionInitEvent> implements Cancellable {
 +
-+    private final InetSocketAddress remoteAddress;
++    private final SocketAddress remoteAddress;
 +    private boolean isCancelled = false;
 +
-+    public ConnectionInitEvent(InetSocketAddress remoteAddress, Callback<ConnectionInitEvent> done) {
++    public ConnectionInitEvent(SocketAddress remoteAddress, Callback<ConnectionInitEvent> done) {
 +        super(done);
 +        this.remoteAddress = remoteAddress;
 +    }
@@ -47,35 +48,46 @@ index 00000000..509b76a3
 +
 +    /**
 +     * @return the INetSocketAddress of the connection being opened
++     * @deprecated BungeeCord can accept connections via Unix domain sockets
 +     */
++    @Deprecated
 +    public InetSocketAddress getRemoteAddress() {
++        return (InetSocketAddress) remoteAddress;
++    }
++
++    /**
++     * @return the SocketAddress of the connection being opened
++     */
++    public SocketAddress getRemoteSocketAddress() {
 +        return remoteAddress;
 +    }
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index 23241d68..31de5a6f 100644
+index 0c91f7ed..e89f3669 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,7 @@
  package net.md_5.bungee.netty;
  
+ import com.google.common.base.Preconditions;
 +import io.github.waterfallmc.waterfall.event.ConnectionInitEvent;
  import io.netty.buffer.PooledByteBufAllocator;
  import io.netty.channel.Channel;
  import io.netty.channel.ChannelException;
-@@ -31,6 +32,7 @@ import net.md_5.bungee.UserConnection;
- import net.md_5.bungee.Util;
- import net.md_5.bungee.api.ProxyServer;
- import net.md_5.bungee.api.config.ListenerInfo;
-+import net.md_5.bungee.api.connection.Connection;
- import net.md_5.bungee.connection.InitialHandler;
- import net.md_5.bungee.protocol.KickStringWriter;
- import net.md_5.bungee.protocol.LegacyDecoder;
-@@ -57,9 +59,22 @@ public class PipelineUtils
+@@ -26,6 +27,8 @@ import io.netty.handler.codec.haproxy.HAProxyMessageDecoder;
+ import io.netty.handler.timeout.ReadTimeoutHandler;
+ import io.netty.util.AttributeKey;
+ import io.netty.util.internal.PlatformDependent;
++
++import java.net.InetSocketAddress;
+ import java.net.SocketAddress;
+ import java.util.concurrent.ThreadFactory;
+ import java.util.concurrent.TimeUnit;
+@@ -62,9 +65,22 @@ public class PipelineUtils
                  return;
              }
  
-+            ConnectionInitEvent connectionInitEvent = new ConnectionInitEvent((InetSocketAddress) ch.remoteAddress(), (result, throwable) -> { // Waterfall
++            ConnectionInitEvent connectionInitEvent = new ConnectionInitEvent(ch.remoteAddress(), (result, throwable) -> { // Waterfall
 +
 +            if (result.isCancelled()) {
 +                ch.close();
@@ -94,7 +106,7 @@ index 23241d68..31de5a6f 100644
              ch.pipeline().addBefore( FRAME_DECODER, LEGACY_DECODER, new LegacyDecoder() );
              ch.pipeline().addAfter( FRAME_DECODER, PACKET_DECODER, new MinecraftDecoder( Protocol.HANDSHAKE, true, ProxyServer.getInstance().getProtocolVersion() ) );
              ch.pipeline().addAfter( FRAME_PREPENDER, PACKET_ENCODER, new MinecraftEncoder( Protocol.HANDSHAKE, true, ProxyServer.getInstance().getProtocolVersion() ) );
-@@ -70,6 +85,9 @@ public class PipelineUtils
+@@ -75,6 +91,9 @@ public class PipelineUtils
              {
                  ch.pipeline().addFirst( new HAProxyMessageDecoder() );
              }
@@ -105,5 +117,5 @@ index 23241d68..31de5a6f 100644
      };
      public static final Base BASE = new Base();
 -- 
-2.24.1
+2.25.0