Updated Upstream (BungeeCord)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
af10f82d Apply and enforce import ordering rules
3f01748d Minecraft 1.14-pre5 support

BungeeCord

@@ -1 +1 @@
-Subproject commit 5aaccd2e9ec554f8f769aa0eb11a7393236aad85
+Subproject commit af10f82d14ef4f052b5179cff2bd94603ddb8cb1

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From fe540697228cf42c513c57d342120e20e80b97a2 Mon Sep 17 00:00:00 2001
+From 8ea2d9b727f96c880a72bedffac8e4e01dc2b277 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 5432a6eb..48bd8a54 100644
+index 79d2d367..f0348e13 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,42 +4,42 @@
@@ -18,7 +18,7 @@ index 5432a6eb..48bd8a54 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -26,7 +26,7 @@ index 5432a6eb..48bd8a54 100644
 -    <artifactId>bungeecord-api</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-api</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-API</name>
@@ -67,7 +67,7 @@ index 5432a6eb..48bd8a54 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index b3bcb6c1..ba94c757 100644
+index 96c4a83a..c49d8503 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,19 +4,19 @@
@@ -78,7 +78,7 @@ index b3bcb6c1..ba94c757 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -86,7 +86,7 @@ index b3bcb6c1..ba94c757 100644
 -    <artifactId>bungeecord-bootstrap</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-bootstrap</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Bootstrap</name>
@@ -138,7 +138,7 @@ index 6be22739..a4516ed9 100644
              return;
          }
 diff --git a/chat/pom.xml b/chat/pom.xml
-index 99b089cb..c9328ac3 100644
+index 5f87b60d..7ad05abb 100644
 --- a/chat/pom.xml
 +++ b/chat/pom.xml
 @@ -4,19 +4,19 @@
@@ -149,7 +149,7 @@ index 99b089cb..c9328ac3 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -157,7 +157,7 @@ index 99b089cb..c9328ac3 100644
 -    <artifactId>bungeecord-chat</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-chat</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Chat</name>
@@ -168,7 +168,7 @@ index 99b089cb..c9328ac3 100644
      <dependencies>
          <dependency>
 diff --git a/config/pom.xml b/config/pom.xml
-index 44005b6f..1bc01b9a 100644
+index 24b6ce1c..9d0fe24b 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
 @@ -4,19 +4,19 @@
@@ -179,7 +179,7 @@ index 44005b6f..1bc01b9a 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -187,7 +187,7 @@ index 44005b6f..1bc01b9a 100644
 -    <artifactId>bungeecord-config</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-config</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Config</name>
@@ -198,7 +198,7 @@ index 44005b6f..1bc01b9a 100644
      <dependencies>
          <dependency>
 diff --git a/event/pom.xml b/event/pom.xml
-index 93c4aa39..e778b3d9 100644
+index 2de6603c..d6efe097 100644
 --- a/event/pom.xml
 +++ b/event/pom.xml
 @@ -4,17 +4,17 @@
@@ -209,7 +209,7 @@ index 93c4aa39..e778b3d9 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -217,7 +217,7 @@ index 93c4aa39..e778b3d9 100644
 -    <artifactId>bungeecord-event</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-event</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Event</name>
@@ -226,7 +226,7 @@ index 93c4aa39..e778b3d9 100644
 +    <description>Generic java event dispatching API intended for use with Waterfall.</description>
  </project>
 diff --git a/log/pom.xml b/log/pom.xml
-index 87b839ad..e24b3e40 100644
+index 05c5f2c9..fd999b51 100644
 --- a/log/pom.xml
 +++ b/log/pom.xml
 @@ -4,19 +4,19 @@
@@ -237,7 +237,7 @@ index 87b839ad..e24b3e40 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -245,7 +245,7 @@ index 87b839ad..e24b3e40 100644
 -    <artifactId>bungeecord-log</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-log</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Log</name>
@@ -267,7 +267,7 @@ index 87b839ad..e24b3e40 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
-index 44d5b21e..db149339 100644
+index 1c4f643f..6f3aa272 100644
 --- a/module/cmd-alert/pom.xml
 +++ b/module/cmd-alert/pom.xml
 @@ -4,14 +4,14 @@
@@ -278,7 +278,7 @@ index 44d5b21e..db149339 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -286,11 +286,11 @@ index 44d5b21e..db149339 100644
 -    <artifactId>bungeecord-module-cmd-alert</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-alert</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
-index e320447a..c8d9826d 100644
+index 3e43c9ae..01d95284 100644
 --- a/module/cmd-find/pom.xml
 +++ b/module/cmd-find/pom.xml
 @@ -4,14 +4,14 @@
@@ -301,7 +301,7 @@ index e320447a..c8d9826d 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -309,11 +309,11 @@ index e320447a..c8d9826d 100644
 -    <artifactId>bungeecord-module-cmd-find</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-find</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
-index 230af0cc..461b26ee 100644
+index 99d6da26..bc5dc210 100644
 --- a/module/cmd-list/pom.xml
 +++ b/module/cmd-list/pom.xml
 @@ -4,14 +4,14 @@
@@ -324,7 +324,7 @@ index 230af0cc..461b26ee 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -332,11 +332,11 @@ index 230af0cc..461b26ee 100644
 -    <artifactId>bungeecord-module-cmd-list</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-list</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
-index 23f9a02b..1b687b3c 100644
+index 4472f373..f6642175 100644
 --- a/module/cmd-send/pom.xml
 +++ b/module/cmd-send/pom.xml
 @@ -4,14 +4,14 @@
@@ -347,7 +347,7 @@ index 23f9a02b..1b687b3c 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -355,11 +355,11 @@ index 23f9a02b..1b687b3c 100644
 -    <artifactId>bungeecord-module-cmd-send</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-send</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
-index 0731bd8e..9bdc3aba 100644
+index 9be58576..c93ab2c9 100644
 --- a/module/cmd-server/pom.xml
 +++ b/module/cmd-server/pom.xml
 @@ -4,14 +4,14 @@
@@ -370,7 +370,7 @@ index 0731bd8e..9bdc3aba 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -378,11 +378,11 @@ index 0731bd8e..9bdc3aba 100644
 -    <artifactId>bungeecord-module-cmd-server</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-server</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/pom.xml b/module/pom.xml
-index 107cb0ef..6bed2ea0 100644
+index 5255b34f..aa604f35 100644
 --- a/module/pom.xml
 +++ b/module/pom.xml
 @@ -4,19 +4,19 @@
@@ -393,7 +393,7 @@ index 107cb0ef..6bed2ea0 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -401,7 +401,7 @@ index 107cb0ef..6bed2ea0 100644
 -    <artifactId>bungeecord-module</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>BungeeCord Modules</name>
@@ -430,7 +430,7 @@ index 107cb0ef..6bed2ea0 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
-index 809cf79c..ca9a7c61 100644
+index c68041d3..e34bac42 100644
 --- a/module/reconnect-yaml/pom.xml
 +++ b/module/reconnect-yaml/pom.xml
 @@ -4,14 +4,14 @@
@@ -441,7 +441,7 @@ index 809cf79c..ca9a7c61 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -449,11 +449,11 @@ index 809cf79c..ca9a7c61 100644
 -    <artifactId>bungeecord-module-reconnect-yaml</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-reconnect-yaml</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/native/pom.xml b/native/pom.xml
-index 15c0ada2..7073b404 100644
+index 959aae03..b5aeb99e 100644
 --- a/native/pom.xml
 +++ b/native/pom.xml
 @@ -4,19 +4,19 @@
@@ -464,7 +464,7 @@ index 15c0ada2..7073b404 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -472,7 +472,7 @@ index 15c0ada2..7073b404 100644
 -    <artifactId>bungeecord-native</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-native</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Native</name>
@@ -483,7 +483,7 @@ index 15c0ada2..7073b404 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 6cd54c2d..5ee845f9 100644
+index 3d0f45ef..a10650d3 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -501,7 +501,7 @@ index 6cd54c2d..5ee845f9 100644
 +
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-parent</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>BungeeCord-Parent</name>
@@ -587,37 +587,33 @@ index 6cd54c2d..5ee845f9 100644
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      </properties>
  
-@@ -118,24 +142,13 @@
+@@ -118,7 +142,17 @@
                      </execution>
                  </executions>
              </plugin>
 +            <!-- Use latest version of the javadoc plugin, fixes some issues with the javadoc tool on recent JDK builds on macOS at least -->
              <plugin>
--                <groupId>org.codehaus.mojo</groupId>
--                <artifactId>animal-sniffer-maven-plugin</artifactId>
--                <version>1.16</version>
--                <executions>
--                    <execution>
--                        <phase>process-classes</phase>
--                        <goals>
--                            <goal>check</goal>
--                        </goals>
--                    </execution>
--                </executions>
 +                <groupId>org.apache.maven.plugins</groupId>
 +                <artifactId>maven-javadoc-plugin</artifactId>
 +                <version>3.1.0</version>
-                 <configuration>
++                <configuration>
--                    <signature>
--                        <groupId>org.codehaus.mojo.signature</groupId>
--                        <artifactId>java18</artifactId>
--                        <version>1.0</version>
--                    </signature>
 +                    <doclint>none</doclint>
-                 </configuration>
++                </configuration>
++            </plugin>
++            <!-- Alow manging of import orders to allow avoiding conflicts
++             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-checkstyle-plugin</artifactId>
+                 <version>3.0.0</version>
+@@ -143,6 +177,7 @@
+                     </dependency>
+                 </dependencies>
              </plugin>
-         </plugins>
++            -->
-@@ -171,4 +184,87 @@
+             <plugin>
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>animal-sniffer-maven-plugin</artifactId>
+@@ -196,4 +231,87 @@
              </plugins>
          </pluginManagement>
      </build>
@@ -706,7 +702,7 @@ index 6cd54c2d..5ee845f9 100644
 +    </profiles>
  </project>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index ec0240a4..ee513895 100644
+index 61fedc71..2493fc17 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
 @@ -4,19 +4,19 @@
@@ -717,7 +713,7 @@ index ec0240a4..ee513895 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -725,7 +721,7 @@ index ec0240a4..ee513895 100644
 -    <artifactId>bungeecord-protocol</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-protocol</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Protocol</name>
@@ -747,7 +743,7 @@ index ec0240a4..ee513895 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index af3536bc..879a82d7 100644
+index 50fb11be..e25697f7 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -758,7 +754,7 @@ index af3536bc..879a82d7 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -766,7 +762,7 @@ index af3536bc..879a82d7 100644
 -    <artifactId>bungeecord-proxy</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-proxy</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Proxy</name>
@@ -818,7 +814,7 @@ index af3536bc..879a82d7 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/query/pom.xml b/query/pom.xml
-index fdd44b20..4ae682ee 100644
+index 9cc2f80b..1fd54029 100644
 --- a/query/pom.xml
 +++ b/query/pom.xml
 @@ -4,19 +4,19 @@
@@ -829,7 +825,7 @@ index fdd44b20..4ae682ee 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.13-SNAPSHOT</version>
+         <version>1.14-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -837,7 +833,7 @@ index fdd44b20..4ae682ee 100644
 -    <artifactId>bungeecord-query</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-query</artifactId>
-     <version>1.13-SNAPSHOT</version>
+     <version>1.14-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Query</name>

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

@@ -1,4 +1,4 @@
-From 4bf66e9d8133c9aa8ccf0b13ab0042a62e062eb2 Mon Sep 17 00:00:00 2001
+From a4ec73ffca3f4ebe747194d3d2925309f5165c56 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 6599e38e..8d931b1d 100644
+index 1d36ff94..f367f66a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -181,7 +181,7 @@ public class BungeeCord extends ProxyServer
+@@ -180,7 +180,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 6599e38e..8d931b1d 100644
  
          System.setSecurityManager( new BungeeSecurityManager() );
  
-@@ -492,7 +492,7 @@ public class BungeeCord extends ProxyServer
+@@ -491,7 +491,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {
@@ -74,7 +74,7 @@ index b0798791..b26035cf 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
-index 771ef5dc..f5c028dd 100644
+index efe048c9..720d0c3b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
 +++ b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
 @@ -23,7 +23,7 @@ public class CommandReload extends Command

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

@@ -1,14 +1,14 @@
-From 973e7912eb74dc03e2b4d1906ced46b5504935f8 Mon Sep 17 00:00:00 2001
+From 27a82909e4dc59093e8dfed729e0f56141665c87 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
 
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index edd82c1e..b30541be 100644
+index 5419445b..0e4e4096 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -79,4 +79,9 @@ public interface ProxyConfig
+@@ -78,4 +78,9 @@ public interface ProxyConfig
       * The favicon used for the server ping list.
       */
      Favicon getFaviconObject();
@@ -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 7fe5bbea..a8bb4fd0 100644
+index f367f66a..1269cc10 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;
@@ -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 36cac069..dddc57a8 100644
+index 49638c3a..886f3b4c 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;
@@ -118,5 +118,5 @@ index 0ec6dabb..44011a96 100644
          if ( permissions == null )
          {
 -- 
-2.20.1
+2.21.0
 

BungeeCord-Patches/0005-Disable-Metrics.patch

@@ -1,4 +1,4 @@
-From d82607666d67970313984865327a2f4542d8ea09 Mon Sep 17 00:00:00 2001
+From 9d0423a0fc9c025eb17ae9c86635cad557f964af 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,7 +6,7 @@ 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 44a77ff3..f38445d6 100644
+index 1269cc10..57d82b66 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
@@ -18,7 +18,7 @@ index 44a77ff3..f38445d6 100644
      /**
       * Server socket listener.
       */
-@@ -297,7 +297,7 @@ public class BungeeCord extends ProxyServer
+@@ -296,7 +296,7 @@ public class BungeeCord extends ProxyServer
                  }
              }
          }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@@ -27,7 +27,7 @@ index 44a77ff3..f38445d6 100644
      }
  
      public void startListeners()
-@@ -429,7 +429,7 @@ public class BungeeCord extends ProxyServer
+@@ -428,7 +428,7 @@ public class BungeeCord extends ProxyServer
                      reconnectHandler.close();
                  }
                  saveThread.cancel();
@@ -38,7 +38,7 @@ index 44a77ff3..f38445d6 100644
                  getLogger().info( "Disabling plugins" );
 diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java
 deleted file mode 100644
-index a7ce8d82..00000000
+index 4fd3dd78..00000000
 --- a/proxy/src/main/java/net/md_5/bungee/Metrics.java
 +++ /dev/null
 @@ -1,129 +0,0 @@
@@ -61,7 +61,7 @@ index a7ce8d82..00000000
 -    /**
 -     * The current revision number
 -     */
--    private final static int REVISION = 5;
+-    private static final int REVISION = 5;
 -    /**
 -     * The base url of the metrics domain
 -     */
@@ -73,7 +73,7 @@ index a7ce8d82..00000000
 -    /**
 -     * Interval of time to ping (in minutes)
 -     */
--    final static int PING_INTERVAL = 10;
+-    static final int PING_INTERVAL = 10;
 -    boolean firstPost = true;
 -
 -    @Override
@@ -172,5 +172,5 @@ index a7ce8d82..00000000
 -    }
 -}
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 4306f1a1ad51415e9e9951901036fa612cf55d08 Mon Sep 17 00:00:00 2001
+From 1e75a4cda2d50082d6a1bbfc0badbb02ec8d3f2b 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 bfb83c21..49c97cd9 100644
+index 57d82b66..ea11489b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -184,8 +184,6 @@ public class BungeeCord extends ProxyServer
+@@ -183,8 +183,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.19.1
+2.21.0
 

BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch

@@ -1,15 +1,15 @@
-From dd1e4f5703b3e243d5e6cc45670f2c5b41128b76 Mon Sep 17 00:00:00 2001
+From 15e675d1835ae9dcab81745fda721a5f15a471bf Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 09:07:51 -0500
 Subject: [PATCH] Fixup ProtocolConstants
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-index 09c2bebf..d9a3c7e5 100644
+index b3037a9c..fb583238 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-@@ -45,6 +45,16 @@ public class ProtocolConstants
+@@ -48,6 +48,16 @@ public class ProtocolConstants
-             ProtocolConstants.MINECRAFT_1_13_2
+             ProtocolConstants.MINECRAFT_1_14
      );
  
 +    public static final boolean isBeforeOrEq(int before, int other)

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

@@ -1,4 +1,4 @@
-From 8357712a235f24756ecd7f7f823fe41fc3c2e0e3 Mon Sep 17 00:00:00 2001
+From 911d768f6c07714cbc4bed0d12b5df5bc8e0fdbb 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
@@ -6,17 +6,17 @@ Subject: [PATCH] Don't access a ByteBuf's underlying array
 It returns the underlying array storage, and does *not* return a view of the buffer as an array
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
-index a71cc710..0e06b49d 100644
+index c01cf317..17e12655 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
-@@ -3,6 +3,7 @@ package net.md_5.bungee.protocol.packet;
+@@ -4,6 +4,7 @@ import com.google.common.base.Function;
- import com.google.common.base.Function;
  import com.google.common.base.Preconditions;
  import com.google.common.base.Predicate;
-+import io.netty.buffer.ByteBufUtil;
- import net.md_5.bungee.protocol.DefinedPacket;
  import io.netty.buffer.ByteBuf;
++import io.netty.buffer.ByteBufUtil; // Waterfall
  import java.io.ByteArrayInputStream;
+ import java.io.DataInput;
+ import java.io.DataInputStream;
 @@ -56,10 +57,23 @@ public class PluginMessage extends DefinedPacket
              return ( input.getTag().equals( "REGISTER" ) || input.getTag().equals( "minecraft:register" ) || input.getTag().equals( "MC|Brand" ) || input.getTag().equals( "minecraft:brand" ) ) && input.getData().length < Byte.MAX_VALUE;
          }
@@ -43,7 +43,7 @@ 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 177b7389..00a1988b 100644
+index fb2d9e27..d1ae05b3 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -216,7 +216,7 @@ public class ServerConnector extends PacketHandler
@@ -56,10 +56,10 @@ index 177b7389..00a1988b 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 75aebc65..277422ee 100644
+index 63162de0..db39f52d 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
-@@ -258,7 +258,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -256,7 +256,7 @@ public class DownstreamBridge extends PacketHandler
  
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@@ -69,7 +69,7 @@ index 75aebc65..277422ee 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 16e07a4c..a2af0a36 100644
+index f75ec97d..bc7a6d80 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;
@@ -86,5 +86,5 @@ index 16e07a4c..a2af0a36 100644
      {
          @Override
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 467824fae00acdabcce056c0243a0fdf0690f53b Mon Sep 17 00:00:00 2001
+From 9cd04197709364da43f7239b2742859a8125cea0 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 fff532de..13215254 100644
+index 7abc76c6..a43082e8 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
+@@ -622,7 +622,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {

BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch

@@ -1,14 +1,14 @@
-From ebf7cd9d6b6e122c450c7ac8847daded9190931e Mon Sep 17 00:00:00 2001
+From fae8d892f44f35dfc160d522255095487c375c85 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 17:36:31 -0600
 Subject: [PATCH] Better unit tests for Chat API
 
 
 diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-index 8fa10e44..a6279567 100644
+index 730370ad..ba261a9a 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-@@ -224,6 +224,26 @@ public class ComponentsTest
+@@ -223,6 +223,26 @@ public class ComponentsTest
          Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
      }
  
@@ -36,20 +36,20 @@ index 8fa10e44..a6279567 100644
      public void testLoopSimple()
      {
 diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
-index 2391c22f..8397db2d 100644
+index 7e63488c..e85c55b7 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
 @@ -13,4 +13,12 @@ public class TranslatableComponentTest
-         assertEquals( "Test string with 2 placeholders: aoeu", testComponent.toPlainText() );
+         Assert.assertEquals( "Test string with 2 placeholders: aoeu", testComponent.toPlainText() );
-         assertEquals( "§fTest string with §f2§f placeholders: §faoeu", testComponent.toLegacyText() );
+         Assert.assertEquals( "§fTest string with §f2§f placeholders: §faoeu", testComponent.toLegacyText() );
      }
 +
 +    @Test
 +    public void testEscapedPercentInPlainText()
 +    {
 +        TranslatableComponent testComponent = new TranslatableComponent( "Test string with %% sign" );
-+        assertEquals( "Test string with % sign", testComponent.toPlainText() );
++        Assert.assertEquals( "Test string with % sign", testComponent.toPlainText() );
-+        assertEquals( "§fTest string with §f%§f sign", testComponent.toLegacyText() );
++        Assert.assertEquals( "§fTest string with §f%§f sign", testComponent.toLegacyText() );
 +    }
  }
 -- 

BungeeCord-Patches/0016-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From f0d0879bb02cdef1fc1cf2c25d82085848903d90 Mon Sep 17 00:00:00 2001
+From 7644bdb527293d3cb40d70759ec849c865ae44bf 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 5d98c781..be32db49 100644
+index ea11489b..d14b8d3c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -521,7 +521,9 @@ public class BungeeCord extends ProxyServer
+@@ -520,7 +520,9 @@ public class BungeeCord extends ProxyServer
          String translation = "<translation '" + name + "' missing>";
          try
          {
@@ -23,10 +23,10 @@ index 5d98c781..be32db49 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 277422ee..bfbc8b18 100644
+index db39f52d..1911923c 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
-@@ -240,7 +240,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -238,7 +238,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(PluginMessage pluginMessage) throws Exception
      {
@@ -34,7 +34,7 @@ index 277422ee..bfbc8b18 100644
          PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
  
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -267,6 +266,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -265,6 +264,7 @@ public class DownstreamBridge extends PacketHandler
  
          if ( pluginMessage.getTag().equals( "BungeeCord" ) )
          {
@@ -43,5 +43,5 @@ index 277422ee..bfbc8b18 100644
              String subChannel = in.readUTF();
  
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From f39c08d489df643450f3e8270c0f799da0c89858 Mon Sep 17 00:00:00 2001
+From ed9181ca751223f7db60e8f9c7e8a9bd7145b27e 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 98be98e8..3e73345f 100644
+index 564c8800..3c817c1e 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
-@@ -370,14 +370,23 @@ public enum Protocol
+@@ -387,14 +387,23 @@ public enum Protocol
              return protocol;
          }
  
@@ -66,7 +66,7 @@ index 98be98e8..3e73345f 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 3e950918..f7bace0e 100644
+index 6c31db0c..88462b34 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;
@@ -93,7 +93,7 @@ index 3e950918..f7bace0e 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 c2cb40b9..6843fd8b 100644
+index e5a63541..644522b1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -70,6 +70,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -105,10 +105,10 @@ index c2cb40b9..6843fd8b 100644
      @Getter
      @NonNull
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index 1ecee69e..994670cd 100644
+index 398cd6dd..c1206a3f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-@@ -273,6 +273,12 @@ public abstract class EntityMap
+@@ -311,6 +311,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
  
@@ -122,5 +122,5 @@ index 1ecee69e..994670cd 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 97320acc36462cc8910f6d0da90409b14e0ebd2f Mon Sep 17 00:00:00 2001
+From b07cd80ecceb48d0dae9ea5760397e962cf0814e 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
 
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index b30541be..79d8b683 100644
+index 0e4e4096..1f643980 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -84,4 +84,21 @@ public interface ProxyConfig
+@@ -83,4 +83,21 @@ public interface ProxyConfig
      // Waterfall Options
      //
  

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

@@ -1,4 +1,4 @@
-From 630311e429f96dd1dc131a37ca81121166109ccd Mon Sep 17 00:00:00 2001
+From e55a753471b65f38809472f0ac1e50897f254767 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,7 +7,7 @@ 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 f7bace0e..e7869cfb 100644
+index 88462b34..82c0bbbd 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -410,6 +410,6 @@ public class ServerConnector extends PacketHandler
@@ -19,10 +19,10 @@ index f7bace0e..e7869cfb 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 18636ca6..f258ddeb 100644
+index 1911923c..2eff743d 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
-@@ -599,6 +599,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -597,6 +597,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -31,10 +31,10 @@ index 18636ca6..f258ddeb 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 13215254..fb799061 100644
+index a43082e8..4731cb9d 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
-@@ -296,16 +296,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -295,16 +295,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          }
  
          this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@@ -54,7 +54,7 @@ index 13215254..fb799061 100644
                  // Ping
                  thisState = State.STATUS;
                  ch.setProtocol( Protocol.STATUS );
-@@ -629,7 +628,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -628,7 +627,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {

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

@@ -1,4 +1,4 @@
-From d19cb1d5f3a20e34e22ead4ec7d7883990db3710 Mon Sep 17 00:00:00 2001
+From 80a9e6ef520f65949b77f5809f561cc018a1f571 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 4e1a4413..3b565575 100644
+index 4731cb9d..6a193d6f 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
-@@ -262,10 +262,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -261,10 +261,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          thisState = State.PING;
      }
  
@@ -29,5 +29,5 @@ index 4e1a4413..3b565575 100644
          disconnect( "" );
      }
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 6213ee559f57aa142489b6f071e612fb199b4244 Mon Sep 17 00:00:00 2001
+From 29a2e6ae61bad08ef21653c2e655561896961a62 Mon Sep 17 00:00:00 2001
 From: kamcio96 <k.nadworski@icloud.com>
 Date: Mon, 14 Mar 2016 16:07:20 -0700
 Subject: [PATCH] Use a worker and a boss event loop group.
@@ -8,7 +8,7 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
 This is proper practice for netty.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index be32db49..7c437c75 100644
+index d14b8d3c..83a300dc 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
@@ -20,7 +20,7 @@ index be32db49..7c437c75 100644
      /**
       * locations.yml save thread.
       */
-@@ -253,7 +253,8 @@ public class BungeeCord extends ProxyServer
+@@ -252,7 +252,8 @@ public class BungeeCord extends ProxyServer
              ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
          }
  
@@ -30,7 +30,7 @@ index be32db49..7c437c75 100644
  
          File moduleDirectory = new File( "modules" );
          moduleManager.load( this, moduleDirectory );
-@@ -333,7 +334,7 @@ public class BungeeCord extends ProxyServer
+@@ -332,7 +333,7 @@ public class BungeeCord extends ProxyServer
                      .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
                      .childAttr( PipelineUtils.LISTENER, info )
                      .childHandler( PipelineUtils.SERVER_CHILD )
@@ -39,7 +39,7 @@ index be32db49..7c437c75 100644
                      .localAddress( info.getHost() )
                      .bind().addListener( listener );
  
-@@ -354,7 +355,7 @@ public class BungeeCord extends ProxyServer
+@@ -353,7 +354,7 @@ public class BungeeCord extends ProxyServer
                          }
                      }
                  };
@@ -48,7 +48,7 @@ index be32db49..7c437c75 100644
              }
          }
      }
-@@ -449,12 +450,14 @@ public class BungeeCord extends ProxyServer
+@@ -448,12 +449,14 @@ public class BungeeCord extends ProxyServer
                  }
  
                  getLogger().info( "Closing IO threads" );
@@ -83,5 +83,5 @@ index f4c17cf4..4c0637b9 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
                  .remoteAddress( getAddress() )
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 1ccc9a25873be025895b669c8c3388bc7e05ada9 Mon Sep 17 00:00:00 2001
+From 9ece9eee1db885737f55a9215fd014c1664f7ccf 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.
@@ -8,10 +8,10 @@ The provided methods will not move a player if a server is removed or the server
 Thanks to Overcast for the idea
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index 0d48c775..7f828010 100644
+index 1f643980..dc4d609f 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -32,9 +32,95 @@ public interface ProxyConfig
+@@ -31,9 +31,95 @@ public interface ProxyConfig
  
      /**
       * Set of all servers.
@@ -108,7 +108,7 @@ index 0d48c775..7f828010 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 baae54f6..ccfefd26 100644
+index 15bea8fe..1c8e9eda 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
 @@ -93,9 +93,25 @@ public abstract class ProxyServer
@@ -156,10 +156,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 794d571f..54e85b0f 100644
+index 9693701d..3fdd9949 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
-@@ -84,7 +84,7 @@ public class CommandServer extends Command implements TabExecutor
+@@ -83,7 +83,7 @@ public class CommandServer extends Command implements TabExecutor
      @Override
      public Iterable<String> onTabComplete(final CommandSender sender, final String[] args)
      {
@@ -169,10 +169,10 @@ index 794d571f..54e85b0f 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 7c437c75..ef6d2028 100644
+index 83a300dc..0ff6781c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -597,10 +597,18 @@ public class BungeeCord extends ProxyServer
+@@ -596,10 +596,18 @@ public class BungeeCord extends ProxyServer
          return config.getServers();
      }
  

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

@@ -1,14 +1,14 @@
-From 8f6e98f20b6661478c0d488272561d375897c9ff Mon Sep 17 00:00:00 2001
+From 85dea98d06763a3709aa6f6fb2354453e336ae59 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 3b565575..af3a8200 100644
+index 6a193d6f..b76eae23 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
+@@ -565,7 +565,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public void disconnect(final BaseComponent... reason)
      {
@@ -18,5 +18,5 @@ index 3b565575..af3a8200 100644
              ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) );
          } else
 -- 
-2.20.1
+2.21.0
 

BungeeCord-Patches/0028-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From 04cd75a5a2fe2d1653b5c9bd2f4e5ef6d14d9fc1 Mon Sep 17 00:00:00 2001
+From 7f4ff24a33f133c3208b27963debf6dbc2c10c37 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,7 +62,7 @@ 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 e7869cfb..c7f081d4 100644
+index 82c0bbbd..c8fc4e41 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -333,7 +333,7 @@ public class ServerConnector extends PacketHandler
@@ -75,18 +75,18 @@ index e7869cfb..c7f081d4 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 f52c1312..14ab7f58 100644
+index 2eff743d..034040a0 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
-@@ -14,6 +14,7 @@ import com.mojang.brigadier.suggestion.SuggestionProvider;
+@@ -12,6 +12,7 @@ import com.mojang.brigadier.context.StringRange;
+ import com.mojang.brigadier.suggestion.Suggestion;
  import com.mojang.brigadier.suggestion.Suggestions;
  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;
-@@ -77,16 +78,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -75,16 +76,19 @@ public class DownstreamBridge extends PacketHandler
              return;
          }
  
@@ -111,7 +111,7 @@ index f52c1312..14ab7f58 100644
      }
  
      @Override
-@@ -101,7 +105,19 @@ public class DownstreamBridge extends PacketHandler
+@@ -99,7 +103,19 @@ public class DownstreamBridge extends PacketHandler
  
          if ( !server.isObsolete() )
          {
@@ -132,7 +132,7 @@ index f52c1312..14ab7f58 100644
          }
  
          ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -483,7 +499,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -481,7 +497,11 @@ public class DownstreamBridge extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@@ -146,5 +146,5 @@ index f52c1312..14ab7f58 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From efbed5b8dbbd0835f2c883dc2669070578707606 Mon Sep 17 00:00:00 2001
+From decc1bf40862deeb8d038607398fa2b368721f10 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
 
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index c7a1c7ca..d93326cb 100644
+index dc4d609f..db615ed9 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -170,6 +170,13 @@ public interface ProxyConfig
+@@ -169,6 +169,13 @@ public interface ProxyConfig
      // Waterfall Options
      //
  
@@ -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 ef6d2028..00f8a19c 100644
+index 0ff6781c..083bc177 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -651,7 +651,7 @@ public class BungeeCord extends ProxyServer
+@@ -650,7 +650,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getGameVersion()
      {

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

@@ -1,22 +1,22 @@
-From 177925e31475b3720037d0765f44d9bfff151a09 Mon Sep 17 00:00:00 2001
+From 724dddb499f59e74f6bb497855d3fa7d04e1b753 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 219488dd..bef7b370 100644
+index e49af259..581503b8 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 @@
+@@ -7,6 +7,8 @@ import net.md_5.bungee.protocol.packet.ClientStatus;
- package net.md_5.bungee.protocol;
+ import net.md_5.bungee.protocol.packet.Commands;
- 
+ import net.md_5.bungee.protocol.packet.EncryptionRequest;
- import net.md_5.bungee.protocol.packet.BossBar;
+ import net.md_5.bungee.protocol.packet.EncryptionResponse;
-+import net.md_5.bungee.protocol.packet.EntityEffect;
++import net.md_5.bungee.protocol.packet.EntityEffect; // Waterfall
-+import net.md_5.bungee.protocol.packet.EntityRemoveEffect;
++import net.md_5.bungee.protocol.packet.EntityRemoveEffect; // Waterfall
+ import net.md_5.bungee.protocol.packet.EntityStatus;
+ import net.md_5.bungee.protocol.packet.Handshake;
  import net.md_5.bungee.protocol.packet.KeepAlive;
- import net.md_5.bungee.protocol.packet.ClientSettings;
- import net.md_5.bungee.protocol.packet.ClientStatus;
 @@ -168,4 +170,14 @@ public abstract class AbstractPacketHandler
      public void handle(Commands commands) throws Exception
      {
@@ -33,7 +33,7 @@ index 219488dd..bef7b370 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 3e73345f..01af5c1c 100644
+index 3c817c1e..3a319cff 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.Commands;
@@ -45,7 +45,7 @@ index 3e73345f..01af5c1c 100644
  import net.md_5.bungee.protocol.packet.Handshake;
  import net.md_5.bungee.protocol.packet.KeepAlive;
  import net.md_5.bungee.protocol.packet.Kick;
-@@ -89,6 +91,25 @@ public enum Protocol
+@@ -91,6 +93,27 @@ public enum Protocol
                      BossBar.class,
                      map( ProtocolConstants.MINECRAFT_1_9, 0x0C )
              );
@@ -57,7 +57,8 @@ index 3e73345f..01af5c1c 100644
 +                    map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B),
 +                    map(ProtocolConstants.MINECRAFT_1_12, 0x4E),
 +                    map(ProtocolConstants.MINECRAFT_1_12_1, 0x4F),
-+                    map(ProtocolConstants.MINECRAFT_1_13, 0x53)
++                    map(ProtocolConstants.MINECRAFT_1_13, 0x53),
++                    map(ProtocolConstants.MINECRAFT_1_14, 0x59)
 +            );
 +            TO_CLIENT.registerPacket(
 +                    EntityRemoveEffect.class,
@@ -65,7 +66,8 @@ index 3e73345f..01af5c1c 100644
 +                    map(ProtocolConstants.MINECRAFT_1_9, 0x31),
 +                    map(ProtocolConstants.MINECRAFT_1_12, 0x32),
 +                    map(ProtocolConstants.MINECRAFT_1_12_1, 0x33),
-+                    map(ProtocolConstants.MINECRAFT_1_13, 0x36)
++                    map(ProtocolConstants.MINECRAFT_1_13, 0x36),
++                    map(ProtocolConstants.MINECRAFT_1_14, 0x38)
 +            );
 +            // Waterfall end
              TO_CLIENT.registerPacket(
@@ -165,7 +167,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 6dae9a88..9c872a1c 100644
+index f3466956..74aa4f3e 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 @@
@@ -190,19 +192,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 522f93c7..f635a7e4 100644
+index 034040a0..fd14f518 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
-@@ -49,6 +49,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
+@@ -47,6 +47,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;
 +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.Kick;
  import net.md_5.bungee.protocol.packet.PlayerListItem;
- import net.md_5.bungee.protocol.packet.Respawn;
+@@ -582,6 +584,32 @@ public class DownstreamBridge extends PacketHandler
-@@ -584,6 +586,32 @@ public class DownstreamBridge extends PacketHandler
          }
      }
  
@@ -273,5 +275,5 @@ index 0d683856..c1272da3 100644
       * Sends the server mod list to the client, or stores it for sending later.
       *
 -- 
-2.20.1
+2.21.0
 

BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch

@@ -1,4 +1,4 @@
-From 2709eadf686971d35fbcfe3e4041a320cd620a15 Mon Sep 17 00:00:00 2001
+From b6c3ccafa8e2479faa7bb5077b90219a4d20ff69 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Optionally use async Netty DNS resolver
 We no longer need to cache the address for the session server now.
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index d93326cb..cb62dfa8 100644
+index db615ed9..af93ae8c 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -177,6 +177,13 @@ public interface ProxyConfig
+@@ -176,6 +176,13 @@ public interface ProxyConfig
       */
      String getGameVersion();
  
@@ -24,7 +24,7 @@ index d93326cb..cb62dfa8 100644
  
      /**
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 03e35f42..fa1e6046 100644
+index 5a81d36f..e637cf99 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -41,6 +41,14 @@
@@ -170,7 +170,7 @@ index 2feb4d66..b265bb43 100644
 +    // 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 ba274eea..feea59d6 100644
+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

BungeeCord-Patches/0036-Fix-some-forge-plugin-message-packets-not-being-forw.patch

@@ -1,4 +1,4 @@
-From 6989508c9780a3ac06168830cdf00e3fb92655d0 Mon Sep 17 00:00:00 2001
+From 0bcddf3f2a54189e017bb728c4486f65dd691a8b Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Mon, 17 Jul 2017 20:24:17 +0100
 Subject: [PATCH] Fix some forge plugin message packets not being forwarded
@@ -42,10 +42,10 @@ index 52429265..5e02f8c8 100644
          }
  
 diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeServerHandler.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeServerHandler.java
-index 3fe5ec5f..a0c07874 100644
+index 7166d061..b5b9ec70 100644
 --- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeServerHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeServerHandler.java
-@@ -51,7 +51,7 @@ public class ForgeServerHandler
+@@ -50,7 +50,7 @@ public class ForgeServerHandler
          ForgeServerHandshakeState prevState = state;
          packetQueue.add( message );
          state = state.send( message, con );
@@ -55,5 +55,5 @@ index 3fe5ec5f..a0c07874 100644
              synchronized ( packetQueue )
              {
 -- 
-2.19.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From b4677c171d3d0aae5a492540823c2b737db5fa41 Mon Sep 17 00:00:00 2001
+From 934d7e095476ad257592f863f34dce3286ea816d 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,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
 
 
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index ba94c757..6cacf112 100644
+index c49d8503..487fb3bb 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -47,6 +47,9 @@
@@ -39,7 +39,7 @@ index ba94c757..6cacf112 100644
      </build>
 diff --git a/log4j/pom.xml b/log4j/pom.xml
 new file mode 100644
-index 00000000..e27b582f
+index 00000000..89d3b01d
 --- /dev/null
 +++ b/log4j/pom.xml
 @@ -0,0 +1,48 @@
@@ -50,13 +50,13 @@ index 00000000..e27b582f
 +    <parent>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-+        <version>1.13-SNAPSHOT</version>
++        <version>1.14-SNAPSHOT</version>
 +        <relativePath>../pom.xml</relativePath>
 +    </parent>
 +
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-log4j</artifactId>
-+    <version>1.13-SNAPSHOT</version>
++    <version>1.14-SNAPSHOT</version>
 +    <packaging>jar</packaging>
 +
 +    <name>Waterfall-Log</name>
@@ -232,7 +232,7 @@ index 00000000..93ce3b14
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index daaf18b9..4a007355 100644
+index a10650d3..98df957c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,7 @@
@@ -244,7 +244,7 @@ index daaf18b9..4a007355 100644
          <module>protocol</module>
          <module>proxy</module>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index fa1e6046..f0497f59 100644
+index e637cf99..f15927ec 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -70,7 +70,7 @@
@@ -323,7 +323,7 @@ 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 00f8a19c..c407cc97 100644
+index 083bc177..c527e3a9 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;
@@ -370,7 +370,7 @@ index 00f8a19c..c407cc97 100644
      @Getter
      private final Logger logger;
      public final Gson gson = new GsonBuilder()
-@@ -193,6 +192,8 @@ public class BungeeCord extends ProxyServer
+@@ -192,6 +191,8 @@ public class BungeeCord extends ProxyServer
          }
          reloadMessages();
  
@@ -379,7 +379,7 @@ index 00f8a19c..c407cc97 100644
          // This is a workaround for quite possibly the weirdest bug I have ever encountered in my life!
          // When jansi attempts to extract its natives, by default it tries to extract a specific version,
          // using the loading class's implementation version. Normally this works completely fine,
-@@ -211,6 +212,9 @@ public class BungeeCord extends ProxyServer
+@@ -210,6 +211,9 @@ public class BungeeCord extends ProxyServer
          logger = new BungeeLogger( "BungeeCord", "proxy.log", consoleReader );
          System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
          System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );

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

@@ -1,4 +1,4 @@
-From 1b3b7473bbd23f585eb6bb27ead5fd4c526da180 Mon Sep 17 00:00:00 2001
+From 64b96dc7ccb8674d2a4859ef335135528c2dfdf4 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 af3a8200..b0b2994a 100644
+index b76eae23..fecc597f 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
+@@ -547,7 +547,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          };
  
          // fire login event
@@ -65,5 +65,5 @@ index af3a8200..b0b2994a 100644
  
      @Override
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 781898a172025bb263f888e7e717ea5c8a5055b3 Mon Sep 17 00:00:00 2001
+From 2c0d98c9774251456c583e3581a4dc879bd60d6a 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
 
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index cb62dfa8..95cd6ad4 100644
+index af93ae8c..058cca67 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -170,6 +170,13 @@ public interface ProxyConfig
+@@ -169,6 +169,13 @@ public interface ProxyConfig
      // Waterfall Options
      //
  
@@ -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 47bdce40..765731d8 100644
+index fecc597f..3a9dab68 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,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -314,7 +314,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                  break;
              case 2:
                  // Login

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

@@ -1,14 +1,14 @@
-From aee90e210ae6132b9276f7e6a0f7dfa7c6b47f56 Mon Sep 17 00:00:00 2001
+From 8508e32ef2fafc99b25534646a23294388b11771 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 c407cc97..4ff03488 100644
+index c527e3a9..8acdc22d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -275,8 +275,6 @@ public class BungeeCord extends ProxyServer
+@@ -274,8 +274,6 @@ public class BungeeCord extends ProxyServer
              registerChannel( ForgeConstants.FML_TAG );
              registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
              registerChannel( ForgeConstants.FORGE_REGISTER );
@@ -18,7 +18,7 @@ index c407cc97..4ff03488 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 92093602..0482d74a 100644
+index 2ec6c23c..5841cf63 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
 @@ -66,7 +66,7 @@ public abstract class Configuration implements ProxyConfig
@@ -31,5 +31,5 @@ index 92093602..0482d74a 100644
      @Synchronized("serversLock") // Waterfall
      public void load()
 -- 
-2.20.1
+2.21.0
 

BungeeCord-Patches/0045-Add-Configuration-to-allow-empty-packets.patch

@@ -1,4 +1,4 @@
-From 13e5493fc39a0d75046e9dfece46bea0955d46e9 Mon Sep 17 00:00:00 2001
+From 59cd643646283aa72acf873abea280d7c59ceeba Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 12 Oct 2018 14:28:52 +0100
 Subject: [PATCH] Add Configuration to allow empty packets
@@ -11,10 +11,10 @@ provided as a last ditch effort for server owners to allow players
 to connect in such a broken state as allowed by vanilla.
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index 95cd6ad4..a8705438 100644
+index 058cca67..46adc983 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -208,4 +208,11 @@ public interface ProxyConfig
+@@ -207,4 +207,11 @@ public interface ProxyConfig
       * @return should we disable the tab completion limit for 1.13+ clients
       */
      boolean isDisableModernTabLimiter();
@@ -27,10 +27,10 @@ index 95cd6ad4..a8705438 100644
 +    boolean isAllowEmptyPackets();
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
-index 29e54dba..880a3dc7 100644
+index e903fd09..98a54601 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
-@@ -12,6 +12,13 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
+@@ -11,6 +11,13 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
  {
  
      private static boolean DIRECT_WARNING;
@@ -44,7 +44,7 @@ index 29e54dba..880a3dc7 100644
  
      @Override
      protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
-@@ -31,7 +38,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
+@@ -30,7 +37,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
              if ( buf[i] >= 0 )
              {
                  int length = DefinedPacket.readVarInt( Unpooled.wrappedBuffer( buf ) );
@@ -94,7 +94,7 @@ index 4ff8da6d..f28f0111 100644
 +    }
  }
 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 feea59d6..042bccb5 100644
+index 23241d68..051430ce 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
 @@ -146,7 +146,7 @@ public class PipelineUtils

BungeeCord-Patches/0046-Don-t-use-a-bytebuf-for-packet-decoding.patch

@@ -1,14 +1,14 @@
-From d6ffcd90f47bc395e824b36fe7fe47991bf869e1 Mon Sep 17 00:00:00 2001
+From 5c4d4e11b2329b221394f7b216c749edc00c57bf Mon Sep 17 00:00:00 2001
 From: creeper123123321 <creeper123123321@gmail.com>
 Date: Thu, 17 Jan 2019 03:25:59 +0000
 Subject: [PATCH] Don't use a bytebuf for packet decoding
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
-index 880a3dc7..aef9fc37 100644
+index 98a54601..8de4d9be 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
-@@ -25,8 +25,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
+@@ -24,8 +24,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
      {
          in.markReaderIndex();
  
@@ -18,7 +18,7 @@ index 880a3dc7..aef9fc37 100644
          {
              if ( !in.isReadable() )
              {
-@@ -34,10 +33,13 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
+@@ -33,10 +32,13 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
                  return;
              }
  
@@ -35,7 +35,7 @@ index 880a3dc7..aef9fc37 100644
                  if ( length == 0 && !allowEmptyPackets) // Waterfall
                  {
                      throw new CorruptedFrameException( "Empty Packet!" );
-@@ -47,26 +49,11 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
+@@ -46,26 +48,11 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
                  {
                      in.resetReaderIndex();
                      return;
@@ -67,5 +67,5 @@ index 880a3dc7..aef9fc37 100644
              }
          }
 -- 
-2.20.1
+2.21.0
 

BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch

@@ -1,4 +1,4 @@
-From 30dfafedb513a62703ceb09ee107372b7e38437b Mon Sep 17 00:00:00 2001
+From fc9081afdc806555f78e430e6315dc2dfa23f2a3 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
@@ -12,10 +12,10 @@ may also create various issues with mods which do not support this,
 hence why the configuration option is provided
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index a8705438..ab289e72 100644
+index 46adc983..0e69db36 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -215,4 +215,9 @@ public interface ProxyConfig
+@@ -214,4 +214,9 @@ public interface ProxyConfig
       * @return should we allow empty packets
       */
      boolean isAllowEmptyPackets();
@@ -57,7 +57,7 @@ index f28f0111..41a71f65 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 c7f081d4..110ac496 100644
+index c8fc4e41..94545251 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -225,7 +225,7 @@ public class ServerConnector extends PacketHandler
@@ -102,7 +102,7 @@ index c7f081d4..110ac496 100644
 +                user.setClientEntityId( login.getEntityId() );
 +
 +                Login modLogin = new Login( login.getEntityId(),login.getGameMode(), login.getDimension(),
-+                        login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.isReducedDebugInfo() );
++                        login.getDifficulty(), login.getMaxPlayers(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo() );
 +                user.unsafe().sendPacket(modLogin);
 +
 +                // Only send if we're in the same dimension
@@ -115,7 +115,7 @@ index c7f081d4..110ac496 100644
              user.setDimension( login.getDimension() );
  
 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 9c872a1c..8a524a64 100644
+index 74aa4f3e..7e9678d9 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -145,6 +145,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -152,10 +152,10 @@ index 9c872a1c..8a524a64 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 f635a7e4..c1dc6489 100644
+index fd14f518..fba84905 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
-@@ -590,6 +590,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -588,6 +588,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(EntityEffect entityEffect) throws Exception
      {
@@ -163,7 +163,7 @@ index f635a7e4..c1dc6489 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()) {
-@@ -601,6 +602,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -599,6 +600,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(EntityRemoveEffect removeEffect) throws Exception
      {
@@ -172,11 +172,11 @@ index f635a7e4..c1dc6489 100644
      }
  
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index 994670cd..e14b72db 100644
+index c1206a3f..f1ed6050 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-@@ -233,7 +233,13 @@ public abstract class EntityMap
+@@ -271,7 +271,13 @@ public abstract class EntityMap
-                     }
+                     DefinedPacket.readVarInt( packet );
                      break;
                  default:
 -                    throw new IllegalArgumentException( "Unknown meta type " + type );

BungeeCord-Patches/0049-Add-ProxyDefineCommandsEvent.patch

@@ -1,4 +1,4 @@
-From c6f4a177aeb85a63c485e4e12a56f2c3c2e9fc4a Mon Sep 17 00:00:00 2001
+From 64d9097f51560007e15d0c3ef63a024e7562e4b1 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,21 +54,29 @@ 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 c1dc6489..7698b871 100644
+index fba84905..1f8a2439 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
-@@ -14,7 +14,10 @@ import com.mojang.brigadier.suggestion.SuggestionProvider;
+@@ -12,14 +12,17 @@ import com.mojang.brigadier.context.StringRange;
+ import com.mojang.brigadier.suggestion.Suggestion;
  import com.mojang.brigadier.suggestion.Suggestions;
  import com.mojang.brigadier.tree.LiteralCommandNode;
- import java.io.DataInput;
+-import java.util.Objects; // Waterfall
-+import java.util.HashMap; // Waterfall
- import java.util.Objects; // Waterfall
 +
 +import io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent; // Waterfall
  import io.netty.buffer.ByteBuf;
  import io.netty.buffer.ByteBufAllocator;
  import io.netty.buffer.Unpooled;
-@@ -625,9 +628,25 @@ public class DownstreamBridge extends PacketHandler
+ import java.io.DataInput;
+ import java.util.ArrayList;
++import java.util.HashMap; // Waterfall
+ import java.util.List;
+ import java.util.Map;
++import java.util.Objects; // Waterfall
+ import lombok.RequiredArgsConstructor;
+ import net.md_5.bungee.ServerConnection;
+ import net.md_5.bungee.UserConnection;
+@@ -623,9 +626,25 @@ public class DownstreamBridge extends PacketHandler
      {
          boolean modified = false;
  

BungeeCord-Patches/0050-Use-proper-max-length-for-serverbound-chat-packet.patch

@@ -1,14 +1,14 @@
-From 5bc1929e48a551778c0c8e7f596f935c1c562e56 Mon Sep 17 00:00:00 2001
+From 9de373cbf48bf9e971def774c5611cf8dc91f891 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:39:12 -0700
 Subject: [PATCH] Use proper max length for serverbound chat packet
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index 28a3efde..d2d23b34 100644
+index 57155c3b..9951c1f9 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -38,6 +38,34 @@ public abstract class DefinedPacket
+@@ -37,6 +37,34 @@ public abstract class DefinedPacket
          return new String( b, Charsets.UTF_8 );
      }
  
@@ -44,7 +44,7 @@ index 28a3efde..d2d23b34 100644
      {
          if ( b.length > Short.MAX_VALUE )
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
-index 95ad39b7..ce131cb9 100644
+index ffcd815c..0ded6739 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Chat.java
 @@ -27,6 +27,11 @@ public class Chat extends DefinedPacket

BungeeCord-Patches/0052-Fix-upstream-javadocs.patch

@@ -1,14 +1,14 @@
-From 8eaa9350d99477878bc934fadf0ead9d685ee577 Mon Sep 17 00:00:00 2001
+From f8145502b28ce0b36f31ea74efe4ab1c743d8275 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 30 Mar 2019 15:11:11 +0000
 Subject: [PATCH] Fix upstream javadocs
 
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-index 4372f758..b39f3a98 100644
+index 0e69db36..cbcf8a24 100644
 --- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
 +++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
-@@ -17,22 +17,27 @@ public interface ProxyConfig
+@@ -16,22 +16,27 @@ public interface ProxyConfig
  
      /**
       * Time before users are disconnected due to no network activity.
@@ -36,7 +36,7 @@ index 4372f758..b39f3a98 100644
       * @deprecated The returned map may be modified concurrently by the proxy.
       *             The safe alternative is {@link #getServersCopy()}.
       */
-@@ -123,32 +128,44 @@ public interface ProxyConfig
+@@ -122,32 +127,44 @@ public interface ProxyConfig
  
      /**
       * Does the server authenticate with mojang
@@ -82,7 +82,7 @@ index 4372f758..b39f3a98 100644
       */
      @Deprecated
      boolean isIpForward();
-@@ -156,6 +173,7 @@ public interface ProxyConfig
+@@ -155,6 +172,7 @@ public interface ProxyConfig
      /**
       * The encoded favicon.
       *
@@ -90,7 +90,7 @@ index 4372f758..b39f3a98 100644
       * @deprecated Use #getFaviconObject instead.
       */
      @Deprecated
-@@ -163,6 +181,8 @@ public interface ProxyConfig
+@@ -162,6 +180,8 @@ public interface ProxyConfig
  
      /**
       * The favicon used for the server ping list.
@@ -100,7 +100,7 @@ index 4372f758..b39f3a98 100644
      Favicon getFaviconObject();
  
 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 ccfefd26..4965b234 100644
+index 1c8e9eda..d44ac67e 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
 @@ -52,6 +52,9 @@ public abstract class ProxyServer