Update Bungeecord

BungeeCord

@@ -1 +1 @@
-Subproject commit afef0ec1fed04f2ecea9df5134cfac7505c341a1
+Subproject commit 7dd09289ee7aed473caaf228e461f8927c51f1a5

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 44f61c24b033e3bc7fd167e5163f7b0eff51ee81 Mon Sep 17 00:00:00 2001
+From cd99027f638fc0db380f0635fd44471e9411fb62 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
@@ -67,7 +67,7 @@ index 5432a6eb..48bd8a54 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 615ac3f5..ee76507c 100644
+index b3bcb6c1..ba94c757 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,19 +4,19 @@
@@ -96,7 +96,7 @@ index 615ac3f5..ee76507c 100644
  
      <properties>
          <maven.deploy.skip>true</maven.deploy.skip>
-@@ -27,8 +27,8 @@
+@@ -27,15 +27,15 @@
  
      <dependencies>
          <dependency>
@@ -107,7 +107,6 @@ index 615ac3f5..ee76507c 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -41,7 +41,7 @@
      </dependencies>
  
      <build>
@@ -116,7 +115,7 @@ index 615ac3f5..ee76507c 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-@@ -50,7 +50,7 @@
+@@ -44,7 +44,7 @@
                  <configuration>
                      <archive>
                          <manifestEntries>
@@ -126,17 +125,14 @@ index 615ac3f5..ee76507c 100644
                              <Specification-Version>${maven.build.timestamp}</Specification-Version>
                          </manifestEntries>
 diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
-index b7cb81e2..a4516ed9 100644
+index 6be22739..a4516ed9 100644
 --- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
 +++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
-@@ -5,9 +5,9 @@ public class Bootstrap
+@@ -7,7 +7,7 @@ public class Bootstrap
- 
-     public static void main(String[] args) throws Exception
      {
--        if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 51.0 )
+         if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 )
-+        if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 )
          {
--            System.err.println( "*** ERROR *** BungeeCord requires Java 7 or above to function! Please download and install it!" );
+-            System.err.println( "*** ERROR *** BungeeCord requires Java 8 or above to function! Please download and install it!" );
 +            System.err.println( "*** ERROR *** Waterfall requires Java 8 or above to function! Please download and install it!" );
              System.out.println( "You can check your Java version with the command: java -version" );
              return;
@@ -487,7 +483,7 @@ index 15c0ada2..7073b404 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 8587db46..5eab8750 100644
+index 4f8786a5..5eab8750 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -614,7 +610,7 @@ index 8587db46..5eab8750 100644
                  <configuration>
 -                    <signature>
 -                        <groupId>org.codehaus.mojo.signature</groupId>
--                        <artifactId>java17</artifactId>
+-                        <artifactId>java18</artifactId>
 -                        <version>1.0</version>
 -                    </signature>
 +                    <additionalparam>-Xdoclint:none</additionalparam>
@@ -672,10 +668,10 @@ index 8587db46..5eab8750 100644
 +    </profiles>
  </project>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 34e38ff7..a635cb70 100644
+index ec0240a4..ee513895 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
-@@ -4,24 +4,24 @@
+@@ -4,19 +4,19 @@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
@@ -699,7 +695,11 @@ index 34e38ff7..a635cb70 100644
 +    <name>Waterfall-Protocol</name>
 +    <description>Minimal implementation of the Minecraft protocol for use in Waterfall</description>
  
-     <dependencies>
+     <!-- We really shouldn't depend on external repositories, but at least this is the Central staging one -->
+     <repositories>
+@@ -41,8 +41,8 @@
+             <scope>compile</scope>
+         </dependency>
          <dependency>
 -            <groupId>net.md-5</groupId>
 -            <artifactId>bungeecord-chat</artifactId>
@@ -709,7 +709,7 @@ index 34e38ff7..a635cb70 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 2db37850..f4eae4e3 100644
+index af3536bc..879a82d7 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -821,5 +821,5 @@ index fdd44b20..4ae682ee 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.20.0
+2.20.1
 

BungeeCord-Patches/0002-Copy-license-files-into-jar.patch

@@ -1,14 +1,14 @@
-From 7722688cbcf4e88c94f858e0e98975d6188637f6 Mon Sep 17 00:00:00 2001
+From 3692953ec62a6a392c46c1bea06cc8eea0b28644 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 18 Jul 2018 20:23:03 +0300
 Subject: [PATCH] Copy license files into jar
 
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 00eb9c5c..841f014e 100644
+index 879a82d7..03e35f42 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
-@@ -98,6 +98,20 @@
+@@ -104,6 +104,20 @@
                  <directory>src/main/resources</directory>
                  <filtering>true</filtering>
              </resource>
@@ -30,5 +30,5 @@ index 00eb9c5c..841f014e 100644
      </build>
  </project>
 -- 
-2.18.0
+2.20.1
 

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

@@ -1,31 +1,9 @@
-From 07f1a21a2ec62989967c0f86c1cd5c63f9f9ade3 Mon Sep 17 00:00:00 2001
+From a3d08e67c922ca102c733d7f6f26530d9b2dbb03 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
 
 
-diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index b6b2ceef..11526c9c 100644
---- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -43,7 +43,7 @@ public class BungeeCordLauncher
-             if ( buildDate.before( deadline.getTime() ) )
-             {
-                 System.err.println( "*** Warning, this build is outdated ***" );
--                System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" );
-+                System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
-                 System.err.println( "*** You will get NO support regarding this build ***" );
-                 System.err.println( "*** Server will start in 10 seconds ***" );
-                 Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
-@@ -52,7 +52,7 @@ public class BungeeCordLauncher
- 
-         BungeeCord bungee = new BungeeCord();
-         ProxyServer.setInstance( bungee );
--        bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
-+        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
-         bungee.start();
- 
-         if ( !options.has( "noconsole" ) )
 diff --git a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
 index f1ccd4f6..d703d6d2 100644
 --- a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
@@ -39,19 +17,6 @@ index f1ccd4f6..d703d6d2 100644
          this.logger = logger;
      }
  
-diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java
-index 9d51608d..446dfe2f 100644
---- a/proxy/src/main/java/Test.java
-+++ b/proxy/src/main/java/Test.java
-@@ -19,7 +19,7 @@ public class Test
-     {
-         BungeeCord bungee = new BungeeCord();
-         ProxyServer.setInstance( bungee );
--        bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
-+        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
-         bungee.start();
- 
-         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 20e14557..7fe5bbea 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -74,6 +39,28 @@ index 20e14557..7fe5bbea 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 c38b8fc2..20681838 100644
+--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
++++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+@@ -43,7 +43,7 @@ public class BungeeCordLauncher
+             if ( buildDate.before( deadline.getTime() ) )
+             {
+                 System.err.println( "*** Warning, this build is outdated ***" );
+-                System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" );
++                System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
+                 System.err.println( "*** You will get NO support regarding this build ***" );
+                 System.err.println( "*** Server will start in 10 seconds ***" );
+                 Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
+@@ -52,7 +52,7 @@ public class BungeeCordLauncher
+ 
+         BungeeCord bungee = new BungeeCord();
+         ProxyServer.setInstance( bungee );
+-        bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
++        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
+         bungee.start();
+ 
+         if ( !options.has( "noconsole" ) )
 diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
 index b0798791..b26035cf 100644
 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
@@ -101,10 +88,10 @@ index 771ef5dc..f5c028dd 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 e15c24c1..8a17c8d4 100644
+index 4cfb13c0..0ec6dabb 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
-@@ -208,7 +208,7 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -213,7 +213,7 @@ public class YamlConfig implements ConfigurationAdapter
              Map<String, Object> val = entry.getValue();
              String name = entry.getKey();
              String addr = get( "address", "localhost:25565", val );
@@ -114,5 +101,5 @@ index e15c24c1..8a17c8d4 100644
              InetSocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.19.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 646d6568f7a1d99bf28ab4651ffa6f48140a99b2 Mon Sep 17 00:00:00 2001
+From a3365b8976e6e8c5825dce8e65089a173ae1af58 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
@@ -63,7 +63,7 @@ index 7fe5bbea..a8bb4fd0 100644
       * Localization bundle.
       */
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index d7879d10..1c585e60 100644
+index 36cac069..dddc57a8 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 @@ -24,7 +24,7 @@ import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -76,7 +76,7 @@ index d7879d10..1c585e60 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 8a17c8d4..5237182a 100644
+index 0ec6dabb..e517ea5d 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
@@ -109,14 +109,6 @@ index 8a17c8d4..5237182a 100644
      {
          try
          {
-@@ -83,6 +93,7 @@ public class YamlConfig implements ConfigurationAdapter
-             throw new RuntimeException( "Could not load configuration!", ex );
-         }
- 
-+        if (!doPermissions) return;
-         Map<String, Object> permissions = get( "permissions", new HashMap<String, Object>() );
-         if ( permissions.isEmpty() )
-         {
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch

@@ -1,4 +1,4 @@
-From e53d8ec67e3c51e7b0f4efe1ce0bbf23c7292433 Mon Sep 17 00:00:00 2001
+From 1df2c40d2044cc8992d1fb9c1a646964f30cf162 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 a71cc710..0e06b49d 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 d81cda98..29245c94 100644
+index 177b7389..00a1988b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -214,7 +214,7 @@ public class ServerConnector extends PacketHandler
+@@ -216,7 +216,7 @@ public class ServerConnector extends PacketHandler
  
              ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@@ -56,10 +56,10 @@ index d81cda98..29245c94 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 22a5ac05..d4c58098 100644
+index 25b81722..1693f42b 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
-@@ -242,7 +242,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -251,7 +251,7 @@ public class DownstreamBridge extends PacketHandler
  
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@@ -86,5 +86,5 @@ index ffee7062..09486b4a 100644
      {
          @Override
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0011-Optimize-uuid-conversions.patch

@@ -1,4 +1,4 @@
-From 42d1be8b5c8bafde6901734fe2c9f28f8f1dbb3f Mon Sep 17 00:00:00 2001
+From 4a5bbd52b44ae6c14c66164cc52e32d32a0b6651 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
@@ -249,10 +249,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 34dd743c..8c79f9b0 100644
+index dbd77a35..4c5fbb68 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
-@@ -623,7 +623,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -624,7 +624,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {
@@ -262,5 +262,5 @@ index 34dd743c..8c79f9b0 100644
  
      @Override
 -- 
-2.19.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 7c47855a7b68728aae3816f8426f23855278b085 Mon Sep 17 00:00:00 2001
+From 63e0068231d004959aa61af1ffe9bcc00dc176d0 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,7 +12,7 @@ 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 15fc538a..ad5124e8 100644
+index 00a1988b..3e950918 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;
@@ -23,7 +23,7 @@ index 15fc538a..ad5124e8 100644
  import java.util.Queue;
  import java.util.Set;
  import java.util.UUID;
-@@ -98,15 +99,39 @@ public class ServerConnector extends PacketHandler
+@@ -100,15 +101,39 @@ public class ServerConnector extends PacketHandler
              String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID();
  
              LoginResult profile = user.getPendingConnection().getLoginProfile();
@@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
       * The FML 1.8 handshake token.
       */
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0014-Allow-removing-servers-or-changing-addresses-on-relo.patch

@@ -1,4 +1,4 @@
-From 3435da1bca9417548cfcdd346aa120695a1791d4 Mon Sep 17 00:00:00 2001
+From d70125960b62f1f6c896a0a324a1882140d788ed Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 28 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Allow removing servers or changing addresses on reload
@@ -10,7 +10,7 @@ Kicks players on failure to move.
 Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index 1c585e60..bdb012c3 100644
+index dddc57a8..45736498 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 @@ -11,12 +11,15 @@ import java.util.UUID;
@@ -29,7 +29,7 @@ index 1c585e60..bdb012c3 100644
  import net.md_5.bungee.util.CaseInsensitiveMap;
  import net.md_5.bungee.util.CaseInsensitiveSet;
  
-@@ -103,18 +106,31 @@ public abstract class Configuration implements ProxyConfig
+@@ -109,18 +112,31 @@ public abstract class Configuration implements ProxyConfig
              servers = new CaseInsensitiveMap<>( newServers );
          } else
          {
@@ -72,5 +72,5 @@ index 1c585e60..bdb012c3 100644
              }
          }
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0016-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From 891a76c65e65308ea316dfbdfcc3af776e53eb46 Mon Sep 17 00:00:00 2001
+From 441f1f77ca0f9efb08ded45ebbd15fa0d51cc33d 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
@@ -23,10 +23,10 @@ index 49c97cd9..19b897c0 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 d4c58098..30f8a7df 100644
+index 1693f42b..b54e7b9b 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
-@@ -224,7 +224,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -233,7 +233,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(PluginMessage pluginMessage) throws Exception
      {
@@ -34,7 +34,7 @@ index d4c58098..30f8a7df 100644
          PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
  
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -251,6 +250,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -260,6 +259,7 @@ public class DownstreamBridge extends PacketHandler
  
          if ( pluginMessage.getTag().equals( "BungeeCord" ) )
          {
@@ -43,5 +43,5 @@ index d4c58098..30f8a7df 100644
              String subChannel = in.readUTF();
  
 -- 
-2.19.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 4618e2fd664ab682d3357032f7b19054f088d939 Mon Sep 17 00:00:00 2001
+From c6632e1a71fdcd40b8707e2477111f61df3093f6 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
@@ -37,10 +37,10 @@ index ea44573d..5b32effe 100644
              {
                  packet.read( in, prot.getDirection(), protocolVersion );
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index c4dd00a5..acd28a94 100644
+index 6e2abdc5..1161dc5d 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-@@ -395,14 +395,23 @@ public enum Protocol
+@@ -411,14 +411,23 @@ public enum Protocol
              return protocol;
          }
  
@@ -66,7 +66,7 @@ index c4dd00a5..acd28a94 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 ad5124e8..07fdcedd 100644
+index 3e950918..f7bace0e 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;
@@ -79,7 +79,7 @@ index ad5124e8..07fdcedd 100644
  import net.md_5.bungee.protocol.PacketWrapper;
  import net.md_5.bungee.protocol.Protocol;
  import net.md_5.bungee.protocol.ProtocolConstants;
-@@ -198,6 +200,12 @@ public class ServerConnector extends PacketHandler
+@@ -200,6 +202,12 @@ public class ServerConnector extends PacketHandler
  
          ServerConnection server = new ServerConnection( ch, target );
          ServerConnectedEvent event = new ServerConnectedEvent( user, server );
@@ -122,5 +122,5 @@ index af4da071..7c19c6fb 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0019-Add-basic-support-for-configurable-tab-complete-thro.patch

@@ -1,4 +1,4 @@
-From 3d651f8b60c3a97b2c157d4a02a3083823273759 Mon Sep 17 00:00:00 2001
+From 992e57ffc568170937269a376a08ccba639f13ed Mon Sep 17 00:00:00 2001
 From: Johannes Donath <johannesd@torchmind.com>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -69,10 +69,10 @@ index 741ebfde..91743f01 100644
 +    }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 9666e7a2..8c4f999c 100644
+index 83d7630e..54ccaa49 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -33,6 +33,8 @@ public class UpstreamBridge extends PacketHandler
+@@ -37,6 +37,8 @@ public class UpstreamBridge extends PacketHandler
      private final ProxyServer bungee;
      private final UserConnection con;
  
@@ -81,7 +81,7 @@ index 9666e7a2..8c4f999c 100644
      public UpstreamBridge(ProxyServer bungee, UserConnection con)
      {
          this.bungee = bungee;
-@@ -149,6 +151,20 @@ public class UpstreamBridge extends PacketHandler
+@@ -153,6 +155,20 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public void handle(TabCompleteRequest tabComplete) throws Exception
      {
@@ -103,5 +103,5 @@ index 9666e7a2..8c4f999c 100644
  
          if ( tabComplete.getCursor().startsWith( "/" ) )
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0020-Optional-server-list-ping-logging.patch

@@ -1,4 +1,4 @@
-From dfb9e02e82be2ced28adc5807a9a175383232f1b Mon Sep 17 00:00:00 2001
+From 705dc82dc595ad8c539d46cefd51127523d18eea Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Optional server list ping logging.
@@ -61,10 +61,10 @@ index 91743f01..a5db82b8 100644
      public int getTabThrottle() {
          return tabThrottle;
 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 07fdcedd..1e9c4f1c 100644
+index f7bace0e..e7869cfb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -405,6 +405,6 @@ public class ServerConnector extends PacketHandler
+@@ -410,6 +410,6 @@ public class ServerConnector extends PacketHandler
      @Override
      public String toString()
      {
@@ -73,10 +73,10 @@ index 07fdcedd..1e9c4f1c 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 30f8a7df..ce8da75d 100644
+index b54e7b9b..54be8954 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
-@@ -529,6 +529,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -567,6 +567,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -85,10 +85,10 @@ index 30f8a7df..ce8da75d 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 8c79f9b0..1ebdd3f7 100644
+index 4c5fbb68..efced0e8 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
-@@ -291,16 +291,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -292,16 +292,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          }
  
          this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@@ -108,7 +108,7 @@ index 8c79f9b0..1ebdd3f7 100644
                  // Ping
                  thisState = State.STATUS;
                  ch.setProtocol( Protocol.STATUS );
-@@ -629,7 +628,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -630,7 +629,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {
@@ -118,10 +118,10 @@ index 8c79f9b0..1ebdd3f7 100644
  
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 8c4f999c..78b39fef 100644
+index 54ccaa49..4bb61f63 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -250,6 +250,6 @@ public class UpstreamBridge extends PacketHandler
+@@ -267,6 +267,6 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -130,5 +130,5 @@ index 8c4f999c..78b39fef 100644
      }
  }
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0021-Add-a-property-to-accept-invalid-ping-packets.patch

@@ -1,4 +1,4 @@
-From eafa223c8a5c9f909276681bb61749b671c61f94 Mon Sep 17 00:00:00 2001
+From 694cea94842d2064df0231be1f7b6ffa1ab9c805 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 1ebdd3f7..689d9d72 100644
+index efced0e8..282d5ec2 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
-@@ -257,10 +257,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -258,10 +258,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          thisState = State.PING;
      }
  
@@ -29,5 +29,5 @@ index 1ebdd3f7..689d9d72 100644
          disconnect( "" );
      }
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0024-Validate-that-chat-messages-are-non-blank.patch

@@ -1,4 +1,4 @@
-From dc2d74ec7be07d543d87e35c8ac9cbae4b3d3a1d Mon Sep 17 00:00:00 2001
+From 24da31173f0c8a99366c8c157a0d07058e712a5f Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 25 Oct 2016 12:34:41 -0400
 Subject: [PATCH] Validate that chat messages are non-blank
@@ -33,18 +33,18 @@ index 00000000..940ad806
 +    }
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 78b39fef..e1be7cce 100644
+index 4bb61f63..9287d168 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -1,6 +1,7 @@
+@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
- package net.md_5.bungee.connection;
+ import com.mojang.brigadier.context.StringRange;
- 
+ import com.mojang.brigadier.suggestion.Suggestion;
- import com.google.common.base.Preconditions;
+ import com.mojang.brigadier.suggestion.Suggestions;
 +import io.github.waterfallmc.waterfall.StringUtil;
  import io.netty.channel.Channel;
  import java.util.ArrayList;
- import java.util.List;
+ import java.util.LinkedList;
-@@ -135,6 +136,7 @@ public class UpstreamBridge extends PacketHandler
+@@ -139,6 +140,7 @@ public class UpstreamBridge extends PacketHandler
      {
          int maxLength = ( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_11 ) ? 256 : 100;
          Preconditions.checkArgument( chat.getMessage().length() <= maxLength, "Chat message too long" ); // Mojang limit, check on updates
@@ -53,5 +53,5 @@ index 78b39fef..e1be7cce 100644
          ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
          if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
 -- 
-2.19.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 5ce31a20ed3f1f60ebcd9fa2a6afe25eff20bf07 Mon Sep 17 00:00:00 2001
+From 588ff53bcf3df531bc5de1a913adeb72aa1b46d4 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.
@@ -144,10 +144,10 @@ index 262b29c8..d7ed3e11 100644
      {
          int index = path.indexOf( SEPARATOR );
 diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
-index 27672410..91b4bed9 100644
+index ebf9a12d..489b0018 100644
 --- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
 +++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
-@@ -85,7 +85,7 @@ public class CommandServer extends Command implements TabExecutor
+@@ -84,7 +84,7 @@ public class CommandServer extends Command implements TabExecutor
      @Override
      public Iterable<String> onTabComplete(final CommandSender sender, final String[] args)
      {
@@ -181,7 +181,7 @@ index 20ef5b0d..9dee3bff 100644
  
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index bdb012c3..cbbd8d34 100644
+index 45736498..ba7a1e61 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 @@ -1,6 +1,7 @@
@@ -208,15 +208,15 @@ index bdb012c3..cbbd8d34 100644
      /**
       * Set of all servers.
       */
-@@ -64,6 +67,7 @@ public abstract class Configuration implements ProxyConfig
+@@ -65,6 +68,7 @@ public abstract class Configuration implements ProxyConfig
-     private boolean preventProxyConnections;
      private boolean forgeSupport;
+     private boolean injectCommands;
  
 +    @Synchronized("serversLock") // Waterfall
      public void load()
      {
          ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter();
-@@ -106,7 +110,7 @@ public abstract class Configuration implements ProxyConfig
+@@ -112,7 +116,7 @@ public abstract class Configuration implements ProxyConfig
              servers = new CaseInsensitiveMap<>( newServers );
          } else
          {
@@ -225,7 +225,7 @@ index bdb012c3..cbbd8d34 100644
              this.servers = new CaseInsensitiveMap<>(newServers);
  
              for ( ServerInfo oldServer : oldServers.values() )
-@@ -164,4 +168,71 @@ public abstract class Configuration implements ProxyConfig
+@@ -170,4 +174,71 @@ public abstract class Configuration implements ProxyConfig
      {
          return favicon;
      }
@@ -298,5 +298,5 @@ index bdb012c3..cbbd8d34 100644
 +    // Waterfall end
  }
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0027-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch

@@ -1,14 +1,14 @@
-From d247e4fb8709c256da496d3d26a50e612d79b769 Mon Sep 17 00:00:00 2001
+From f43c192dfecdd497e246131497933cdbae36eded Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 13:36:10 -0600
 Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state
 
 
 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 689d9d72..67ec0628 100644
+index 282d5ec2..5ba336d5 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
-@@ -566,7 +566,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -567,7 +567,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public void disconnect(final BaseComponent... reason)
      {
@@ -18,5 +18,5 @@ index 689d9d72..67ec0628 100644
              ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) );
          } else
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0028-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From 3532666f8929d17b67603472cd109768a5142d26 Mon Sep 17 00:00:00 2001
+From b596e53d71ed3330aba53fb1aa5db81acebd9077 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 1e9c4f1c..1d75cd0d 100644
+index e7869cfb..c7f081d4 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -328,7 +328,7 @@ public class ServerConnector extends PacketHandler
+@@ -333,7 +333,7 @@ public class ServerConnector extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = user.updateAndGetNextServer( target );
@@ -75,18 +75,18 @@ index 1e9c4f1c..1d75cd0d 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 ce8da75d..4743af1d 100644
+index 54be8954..d0c2ac42 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
-@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
+@@ -9,6 +9,7 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder;
- import com.google.common.io.ByteArrayDataOutput;
+ import com.mojang.brigadier.suggestion.SuggestionProvider;
- import com.google.common.io.ByteStreams;
+ import com.mojang.brigadier.tree.LiteralCommandNode;
  import java.io.DataInput;
 +import java.util.Objects; // Waterfall
  import io.netty.buffer.ByteBuf;
  import io.netty.buffer.ByteBufAllocator;
  import io.netty.buffer.Unpooled;
-@@ -61,16 +62,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -70,16 +71,19 @@ public class DownstreamBridge extends PacketHandler
              return;
          }
  
@@ -111,7 +111,7 @@ index ce8da75d..4743af1d 100644
      }
  
      @Override
-@@ -85,7 +89,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -94,7 +98,19 @@ public class DownstreamBridge extends PacketHandler
  
          if ( !server.isObsolete() )
          {
@@ -132,7 +132,7 @@ index ce8da75d..4743af1d 100644
          }
  
          ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -467,7 +483,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -476,7 +492,11 @@ public class DownstreamBridge extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@@ -146,5 +146,5 @@ index ce8da75d..4743af1d 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch

@@ -1,11 +1,11 @@
-From 006ffd6b76838f63748d69ca8d8eeb270ed81ef0 Mon Sep 17 00:00:00 2001
+From f9e766ad2bd4304d50defaa47d567d46e6cd35d7 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
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
-index 93f324e2..0e81b43c 100644
+index 219488dd..bef7b370 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
 @@ -1,6 +1,8 @@
@@ -17,10 +17,11 @@ index 93f324e2..0e81b43c 100644
  import net.md_5.bungee.protocol.packet.KeepAlive;
  import net.md_5.bungee.protocol.packet.ClientSettings;
  import net.md_5.bungee.protocol.packet.ClientStatus;
-@@ -158,4 +160,13 @@ public abstract class AbstractPacketHandler
+@@ -168,4 +170,14 @@ public abstract class AbstractPacketHandler
-     public void handle(LoginPayloadResponse response) throws Exception
+     public void handle(Commands commands) throws Exception
      {
      }
++
 +    // Waterfall start
 +    public void handle(EntityEffect entityEffect) throws Exception
 +    {
@@ -32,19 +33,19 @@ index 93f324e2..0e81b43c 100644
 +    // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index acd28a94..cc863d9b 100644
+index 1161dc5d..39affec6 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-@@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;
+@@ -18,6 +18,8 @@ import net.md_5.bungee.protocol.packet.Commands;
- import net.md_5.bungee.protocol.packet.ClientSettings;
  import net.md_5.bungee.protocol.packet.EncryptionRequest;
  import net.md_5.bungee.protocol.packet.EncryptionResponse;
+ import net.md_5.bungee.protocol.packet.EntityStatus;
 +import net.md_5.bungee.protocol.packet.EntityEffect;
 +import net.md_5.bungee.protocol.packet.EntityRemoveEffect;
  import net.md_5.bungee.protocol.packet.Handshake;
  import net.md_5.bungee.protocol.packet.KeepAlive;
  import net.md_5.bungee.protocol.packet.Kick;
-@@ -94,6 +96,26 @@ public enum Protocol
+@@ -96,6 +98,26 @@ public enum Protocol
                      map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
                      map( ProtocolConstants.MINECRAFT_1_13, 0x0C )
              );
@@ -190,19 +191,19 @@ index 6dae9a88..9c872a1c 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 4743af1d..76dc13aa 100644
+index d0c2ac42..56c81262 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
-@@ -33,6 +33,8 @@ import net.md_5.bungee.protocol.DefinedPacket;
+@@ -42,6 +42,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
- 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;
 +import net.md_5.bungee.protocol.packet.EntityEffect;
 +import net.md_5.bungee.protocol.packet.EntityRemoveEffect;
  import net.md_5.bungee.protocol.packet.KeepAlive;
  import net.md_5.bungee.protocol.packet.PlayerListItem;
  import net.md_5.bungee.protocol.packet.Respawn;
-@@ -540,6 +542,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -549,6 +551,32 @@ public class DownstreamBridge extends PacketHandler
          }
      }
  
@@ -273,5 +274,5 @@ index 0d683856..c1272da3 100644
       * Sends the server mod list to the client, or stores it for sending later.
       *
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0035-Improve-outdated-build-message.patch

@@ -1,13 +1,13 @@
-From 83f19e8b0400e2ae1d6a29837c89a3404d5567f9 Mon Sep 17 00:00:00 2001
+From 0d2024006bef83ca8ead4c18e644db6caf406fd2 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Sat, 10 Jun 2017 20:56:02 +0100
 Subject: [PATCH] Improve outdated build message
 
 
-diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+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 11526c9c..2efe7211 100644
+index 20681838..31cde42d 100644
---- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
++++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 @@ -42,9 +42,9 @@ public class BungeeCordLauncher
              deadline.add( Calendar.WEEK_OF_YEAR, -4 );
              if ( buildDate.before( deadline.getTime() ) )
@@ -22,5 +22,5 @@ index 11526c9c..2efe7211 100644
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
              }
 -- 
-2.19.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From d4c54e88e156584193009438c9d1817e3ff25e74 Mon Sep 17 00:00:00 2001
+From 59847386bf4c839a16b55b9b7a62627e57f637c7 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
 
 
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index ee76507c..dae58ec6 100644
+index ba94c757..6cacf112 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
-@@ -53,6 +53,9 @@
+@@ -47,6 +47,9 @@
                              <Main-Class>net.md_5.bungee.Bootstrap</Main-Class>
                              <Implementation-Version>${describe}</Implementation-Version>
                              <Specification-Version>${maven.build.timestamp}</Specification-Version>
@@ -19,7 +19,7 @@ index ee76507c..dae58ec6 100644
                          </manifestEntries>
                      </archive>
                  </configuration>
-@@ -80,7 +83,17 @@
+@@ -74,7 +77,17 @@
                              </excludes>
                          </filter>
                      </filters>
@@ -37,29 +37,6 @@ index ee76507c..dae58ec6 100644
              </plugin>
          </plugins>
      </build>
-diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index 2efe7211..f5270655 100644
---- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-+++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -57,6 +57,9 @@ public class BungeeCordLauncher
- 
-         if ( !options.has( "noconsole" ) )
-         {
-+            // Waterfall start - Use TerminalConsoleAppender
-+            new io.github.waterfallmc.waterfall.console.WaterfallConsole().start();
-+            /*
-             String line;
-             while ( bungee.isRunning && ( line = bungee.getConsoleReader().readLine( ">" ) ) != null )
-             {
-@@ -65,6 +68,8 @@ public class BungeeCordLauncher
-                     bungee.getConsole().sendMessage( new ComponentBuilder( "Command not found" ).color( ChatColor.RED ).create() );
-                 }
-             }
-+            */
-+            // Waterfall end
-         }
-     }
- }
 diff --git a/log4j/pom.xml b/log4j/pom.xml
 new file mode 100644
 index 00000000..e27b582f
@@ -255,7 +232,7 @@ index 00000000..93ce3b14
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index ddd91e8d..565e70a4 100644
+index 5eab8750..5c9fefbe 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,7 @@
@@ -267,7 +244,7 @@ index ddd91e8d..565e70a4 100644
          <module>protocol</module>
          <module>proxy</module>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 3542b6da..dff5bc74 100644
+index fa1e6046..f0497f59 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -70,7 +70,7 @@
@@ -279,7 +256,7 @@ index 3542b6da..dff5bc74 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
-@@ -98,6 +98,20 @@
+@@ -104,6 +104,20 @@
              <version>5.1.47</version>
              <scope>runtime</scope>
          </dependency>
@@ -300,28 +277,6 @@ index 3542b6da..dff5bc74 100644
      </dependencies>
  
      <build>
-diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java
-index 446dfe2f..f036efcd 100644
---- a/proxy/src/main/java/Test.java
-+++ b/proxy/src/main/java/Test.java
-@@ -22,6 +22,9 @@ public class Test
-         bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
-         bungee.start();
- 
-+        // Waterfall start - Use TerminalConsoleAppender
-+        new io.github.waterfallmc.waterfall.console.WaterfallConsole().start();
-+        /*
-         while ( bungee.isRunning )
-         {
-             String line = bungee.getConsoleReader().readLine( ">" );
-@@ -33,5 +36,7 @@ public class Test
-                 }
-             }
-         }
-+        */
-+        // Waterfall end
-     }
- }
 diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/console/WaterfallConsole.java
 new file mode 100644
 index 00000000..765d24bc
@@ -434,6 +389,29 @@ index 5f34eb4e..d246adb7 100644
  
          pluginManager = new PluginManager( this );
          getPluginManager().registerCommand( null, new CommandReload() );
+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 31cde42d..eeacd0c8 100644
+--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
++++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+@@ -57,6 +57,9 @@ public class BungeeCordLauncher
+ 
+         if ( !options.has( "noconsole" ) )
+         {
++            // Waterfall start - Use TerminalConsoleAppender
++            new io.github.waterfallmc.waterfall.console.WaterfallConsole().start();
++            /*
+             String line;
+             while ( bungee.isRunning && ( line = bungee.getConsoleReader().readLine( ">" ) ) != null )
+             {
+@@ -65,6 +68,8 @@ public class BungeeCordLauncher
+                     bungee.getConsole().sendMessage( new ComponentBuilder( "Command not found" ).color( ChatColor.RED ).create() );
+                 }
+             }
++            */
++            // Waterfall end
+         }
+     }
+ }
 diff --git a/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandCompleter.java b/proxy/src/main/java/net/md_5/bungee/command/ConsoleCommandCompleter.java
 deleted file mode 100644
 index bd52d880..00000000
@@ -479,5 +457,5 @@ index 10366c88..8c5cc949 100644
          }
  
 -- 
-2.19.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From f0f01d45b42a04eb0e1340d5b14f27a27ad20645 Mon Sep 17 00:00:00 2001
+From 4fd06e8257c663bd26e05a05e4787954fd7b76f8 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 67ec0628..e5392222 100644
+index 5ba336d5..b1c086bf 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
-@@ -548,7 +548,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -549,7 +549,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          };
  
          // fire login event
@@ -65,5 +65,5 @@ index 67ec0628..e5392222 100644
  
      @Override
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch

@@ -1,4 +1,4 @@
-From fe89cc5debe4d6d68257860a452ddb905cb503ee Mon Sep 17 00:00:00 2001
+From a4f26c5cac0e1c3782c0f5113967638c272572c0 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
@@ -59,10 +59,10 @@ index b7e3dad0..d343e9b8 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 e5392222..16d60577 100644
+index b1c086bf..e84c8aa4 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
-@@ -310,7 +310,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -311,7 +311,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                  break;
              case 2:
                  // Login
@@ -72,5 +72,5 @@ index e5392222..16d60577 100644
                      bungee.getLogger().log( Level.INFO, "{0} has connected", this );
                  }
 -- 
-2.19.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From cd9503f197d3824dea398b9f045cb9aa3d05f378 Mon Sep 17 00:00:00 2001
+From 799eed4305aa7a672cf3cede6ff43bccfb78b17f 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
@@ -18,7 +18,7 @@ index d246adb7..c1c04995 100644
  
          isRunning = true;
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index cbbd8d34..2599b579 100644
+index ba7a1e61..1d3a1113 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 @@ -65,7 +65,7 @@ public abstract class Configuration implements ProxyConfig
@@ -27,9 +27,9 @@ index cbbd8d34..2599b579 100644
      private boolean preventProxyConnections;
 -    private boolean forgeSupport;
 +    private boolean forgeSupport = true; // Waterfall: default to enabled
+     private boolean injectCommands;
  
      @Synchronized("serversLock") // Waterfall
-     public void load()
 -- 
-2.19.1
+2.20.1
 

BungeeCord-Patches/0046-Do-not-fire-an-exception-for-incoming-invalid-packet.patch

@@ -1,31 +0,0 @@
-From 4ffadd6bd0f696f55a2943d99f20b9e1ff2ffebf Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 18 Nov 2018 23:09:50 +0000
-Subject: [PATCH] Do not fire an exception for incoming invalid packets
-
-The InitialHandler is exposed to incoming traffic from, ideally, the
-minecraft client, however, anything else connecting to this will end
-up causing an exception which is spammy and costly to generate, leading
-to a significant performance impact in some cases.
-
-We will downgrade this to a log message, which should tell us where the
-issue is, and still provide useful information, but will improve the cost
-of such cases.
-
-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 16d60577..5919d54a 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
-@@ -134,7 +134,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
-     {
-         if ( packet.packet == null )
-         {
--            throw new IllegalArgumentException( "Unexpected packet received during login process!\n" + BufUtil.dump( packet.buf, 64 ) );
-+            bungee.getLogger().warning( this.toString() + ": Unexpected packet received during login process!\n" + BufUtil.dump( packet.buf, 64 ) ); // Waterfall
-+            ch.close(); // Waterfall
-         }
-     }
- 
--- 
-2.19.1
-