Merge upstream

Also sneak in a bit of support for 1.13...
2025-04-04 10:55:45 +02:00 · 2018-07-20 03:23:11 +01:00 · 2018-07-20 03:23:11 +01:00 · 5f9f4a5656
commit 5f9f4a5656
parent 3cffe7c4a3
6 changed files with 273 additions and 155 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8d79956adc6c5d54c1ccdeaaff0716a176d88d0b
+Subproject commit 578418c4f2f6b80c4daec69e2deb5edceb19d610
--- a/Waterfall-Proxy-Patches/0001-POM-Changes.patch
+++ b/Waterfall-Proxy-Patches/0001-POM-Changes.patch
@ -1,11 +1,11 @@
-From 1e8ddc9ff06fa93b4732a6ec1f576b28fd1db9e4 Mon Sep 17 00:00:00 2001
+From fa3d391ce01cae6c908695b0654fbd97d8a38610 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 08:56:43 -0500
 Subject: [PATCH] POM Changes


 diff --git a/api/pom.xml b/api/pom.xml
-index 25d870d1..fa56e5c3 100644
+index 0e46cbbe..6058e11c 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
@@ -5,41 +5,41 @@
@ -14,14 +14,14 @@ index 25d870d1..fa56e5c3 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-api</artifactId>
 +    <artifactId>travertine-api</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-API</name>
@ -58,7 +58,7 @@ index 25d870d1..fa56e5c3 100644
             <scope>compile</scope>
         </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 6e8dd81e..93eb9983 100644
+index e7bc7a5d..21990c32 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
@@ -5,18 +5,18 @@
@ -67,14 +67,14 @@ index 6e8dd81e..93eb9983 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-bootstrap</artifactId>
 +    <artifactId>travertine-bootstrap</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Bootstrap</name>
@ -103,7 +103,7 @@ index 6e8dd81e..93eb9983 100644
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
 diff --git a/chat/pom.xml b/chat/pom.xml
-index a908c13e..4db11899 100644
+index 31b98b7d..f6c21ff4 100644
 --- a/chat/pom.xml
 +++ b/chat/pom.xml
@@ -5,18 +5,18 @@
@ -112,14 +112,14 @@ index a908c13e..4db11899 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-chat</artifactId>
 +    <artifactId>travertine-chat</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Chat</name>
@ -130,7 +130,7 @@ index a908c13e..4db11899 100644
     <properties>
         <!-- Require Java 8, not Java 6 -->
 diff --git a/config/pom.xml b/config/pom.xml
-index f4551e4c..3d8dd29a 100644
+index febc4af0..52fbf681 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
@@ -5,18 +5,18 @@
@ -139,14 +139,14 @@ index f4551e4c..3d8dd29a 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-config</artifactId>
 +    <artifactId>travertine-config</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Config</name>
@ -157,7 +157,7 @@ index f4551e4c..3d8dd29a 100644
     <dependencies>
         <dependency>
 diff --git a/event/pom.xml b/event/pom.xml
-index a387b2c0..551a8151 100644
+index e778b3d9..de500af7 100644
 --- a/event/pom.xml
 +++ b/event/pom.xml
@@ -5,16 +5,16 @@
@ -166,14 +166,14 @@ index a387b2c0..551a8151 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-event</artifactId>
 +    <artifactId>travertine-event</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Event</name>
@ -182,7 +182,7 @@ index a387b2c0..551a8151 100644
 +    <description>Generic java event dispatching API intended for use with Travertine.</description>
 </project>
 diff --git a/log/pom.xml b/log/pom.xml
-index b54e01a0..18c356f0 100644
+index e24b3e40..95dd1a83 100644
 --- a/log/pom.xml
 +++ b/log/pom.xml
@@ -5,18 +5,18 @@
@ -191,14 +191,14 @@ index b54e01a0..18c356f0 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-log</artifactId>
 +    <artifactId>travertine-log</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Log</name>
@ -218,7 +218,7 @@ index b54e01a0..18c356f0 100644
             <scope>compile</scope>
         </dependency>
 diff --git a/log4j/pom.xml b/log4j/pom.xml
-index d078cd68..c43e41a5 100644
+index a085a39c..87ee1371 100644
 --- a/log4j/pom.xml
 +++ b/log4j/pom.xml
@@ -4,17 +4,17 @@
@ -227,32 +227,48 @@ index d078cd68..c43e41a5 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-log4j</artifactId>
 +    <artifactId>travertine-log4j</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Log</name>
 +    <name>Travertine-Log</name>
     <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
 
-     <dependencies>
-@@ -61,7 +61,7 @@
- 
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-chat</artifactId>
-+            <artifactId>travertine-chat</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
+     <properties>
+@@ -50,5 +50,24 @@
+             <version>3.4.2</version>
+             <scope>runtime</scope>
         </dependency>
+        <!-- Console improvements -->
+        <dependency>
+            <groupId>net.minecrell</groupId>
+            <artifactId>terminalconsoleappender</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>4.4.0</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.waterfallmc</groupId>
+            <artifactId>travertine-chat</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+     </dependencies>
+ </project>
 diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
-index 2d81204b..1c65ba41 100644
+index db149339..f05130e7 100644
 --- a/module/cmd-alert/pom.xml
 +++ b/module/cmd-alert/pom.xml
@@ -5,13 +5,13 @@
@ -261,18 +277,18 @@ index 2d81204b..1c65ba41 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
 +        <artifactId>travertine-module</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-alert</artifactId>
 +    <artifactId>travertine-module-cmd-alert</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
-index f22790a3..feceb6b3 100644
+index c8d9826d..7f8340e9 100644
 --- a/module/cmd-find/pom.xml
 +++ b/module/cmd-find/pom.xml
@@ -5,13 +5,13 @@
@ -281,18 +297,18 @@ index f22790a3..feceb6b3 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
 +        <artifactId>travertine-module</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-find</artifactId>
 +    <artifactId>travertine-module-cmd-find</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
-index 0e693f11..65ef4aa2 100644
+index 461b26ee..8cdacf0a 100644
 --- a/module/cmd-list/pom.xml
 +++ b/module/cmd-list/pom.xml
@@ -5,13 +5,13 @@
@ -301,18 +317,18 @@ index 0e693f11..65ef4aa2 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
 +        <artifactId>travertine-module</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-list</artifactId>
 +    <artifactId>travertine-module-cmd-list</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
-index ba6de230..09a11b18 100644
+index 1b687b3c..85de8def 100644
 --- a/module/cmd-send/pom.xml
 +++ b/module/cmd-send/pom.xml
@@ -5,13 +5,13 @@
@ -321,18 +337,18 @@ index ba6de230..09a11b18 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
 +        <artifactId>travertine-module</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-send</artifactId>
 +    <artifactId>travertine-module-cmd-send</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
-index e00697fe..dbcb9a12 100644
+index 9bdc3aba..a6c6d277 100644
 --- a/module/cmd-server/pom.xml
 +++ b/module/cmd-server/pom.xml
@@ -5,13 +5,13 @@
@ -341,18 +357,18 @@ index e00697fe..dbcb9a12 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
 +        <artifactId>travertine-module</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-cmd-server</artifactId>
 +    <artifactId>travertine-module-cmd-server</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 diff --git a/module/pom.xml b/module/pom.xml
-index 2b827bb0..1c80e5cd 100644
+index 6bed2ea0..c72d3ecd 100644
 --- a/module/pom.xml
 +++ b/module/pom.xml
@@ -5,18 +5,18 @@
@ -361,14 +377,14 @@ index 2b827bb0..1c80e5cd 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module</artifactId>
 +    <artifactId>travertine-module</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 -    <name>Waterfall Modules</name>
@ -388,7 +404,7 @@ index 2b827bb0..1c80e5cd 100644
             <scope>compile</scope>
         </dependency>
 diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
-index 091ea8cf..feea2195 100644
+index ca9a7c61..78576a53 100644
 --- a/module/reconnect-yaml/pom.xml
 +++ b/module/reconnect-yaml/pom.xml
@@ -5,13 +5,13 @@
@ -397,18 +413,18 @@ index 091ea8cf..feea2195 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-module</artifactId>
 +        <artifactId>travertine-module</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-module-reconnect-yaml</artifactId>
 +    <artifactId>travertine-module-reconnect-yaml</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 diff --git a/native/pom.xml b/native/pom.xml
-index 8b045e3b..172c128f 100644
+index 7073b404..15fa568a 100644
 --- a/native/pom.xml
 +++ b/native/pom.xml
@@ -5,18 +5,18 @@
@ -417,14 +433,14 @@ index 8b045e3b..172c128f 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-native</artifactId>
 +    <artifactId>travertine-native</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Native</name>
@ -435,7 +451,7 @@ index 8b045e3b..172c128f 100644
     <dependencies>
         <dependency>
 diff --git a/pom.xml b/pom.xml
-index 24917ece..98b8586f 100644
+index 0183bf9c..af6d5a97 100644
 --- a/pom.xml
 +++ b/pom.xml
@@ -5,19 +5,19 @@
@ -451,7 +467,7 @@ index 24917ece..98b8586f 100644
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-parent</artifactId>
 +    <artifactId>travertine-parent</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 -    <name>Waterfall-Parent</name>
@ -487,7 +503,7 @@ index 24917ece..98b8586f 100644
 
     <distributionManagement>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 9a4b6529..b6db889c 100644
+index 333ae1e8..88ddcfb9 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
@@ -5,23 +5,23 @@
@ -496,14 +512,14 @@ index 9a4b6529..b6db889c 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-protocol</artifactId>
 +    <artifactId>travertine-protocol</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Protocol</name>
@ -520,7 +536,7 @@ index 9a4b6529..b6db889c 100644
             <scope>compile</scope>
         </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 61886884..3ad693db 100644
+index 2fa860e1..73508887 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
@@ -5,17 +5,17 @@
@ -529,14 +545,14 @@ index 61886884..3ad693db 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-proxy</artifactId>
 +    <artifactId>travertine-proxy</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Proxy</name>
@ -599,7 +615,7 @@ index 61886884..3ad693db 100644
             <scope>compile</scope>
         </dependency>
 diff --git a/query/pom.xml b/query/pom.xml
-index 4b3613fa..b0afcc59 100644
+index 4ae682ee..c8f62a78 100644
 --- a/query/pom.xml
 +++ b/query/pom.xml
@@ -5,18 +5,18 @@
@ -608,14 +624,14 @@ index 4b3613fa..b0afcc59 100644
         <groupId>io.github.waterfallmc</groupId>
 -        <artifactId>waterfall-parent</artifactId>
 +        <artifactId>travertine-parent</artifactId>
-         <version>1.12-SNAPSHOT</version>
+         <version>1.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>io.github.waterfallmc</groupId>
 -    <artifactId>waterfall-query</artifactId>
 +    <artifactId>travertine-query</artifactId>
-     <version>1.12-SNAPSHOT</version>
+     <version>1.13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 -    <name>Waterfall-Query</name>
@ -635,5 +651,5 @@ index 4b3613fa..b0afcc59 100644
             <scope>compile</scope>
         </dependency>
 -- 
-2.17.0
+2.18.0

--- a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
+++ b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-Travertine.patch
@ -1,4 +1,4 @@
-From 32364c6af61be9a79ddbf7a951e52ecd6e36bb29 Mon Sep 17 00:00:00 2001
+From dbea7cd7b61c3c116421321b572ae402618fd288 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 13:47:46 -0600
 Subject: [PATCH] Rename references from Waterfall to Travertine
@ -18,7 +18,7 @@ index a4516ed9..1f63a2c2 100644
             return;
         }
 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 3e719f6e..01289ecf 100644
+index f5270655..87ed8b88 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
@ -53,7 +53,7 @@ index d703d6d2..d8dcdc1e 100644
     }
 
 diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java
-index c3cb5aaa..750217b1 100644
+index f036efcd..c93c313a 100644
 --- a/proxy/src/main/java/Test.java
 +++ b/proxy/src/main/java/Test.java
@@ -19,7 +19,7 @@ public class Test
@ -66,7 +66,7 @@ index c3cb5aaa..750217b1 100644
 
         // Waterfall start - Use TerminalConsoleAppender
 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 43c6e24a..fcbd5e8b 100644
+index 1b486867..83b7d8ba 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -182,7 +182,7 @@ public class BungeeCord extends ProxyServer
@ -78,7 +78,7 @@ index 43c6e24a..fcbd5e8b 100644
 
         try
         {
-@@ -496,7 +496,7 @@ public class BungeeCord extends ProxyServer
+@@ -495,7 +495,7 @@ public class BungeeCord extends ProxyServer
     @Override
     public String getName()
     {
@ -127,5 +127,5 @@ index 1019c307..ff2c0725 100644
             InetSocketAddress address = Util.getAddr( addr );
             ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.17.1
+2.18.0

--- a/Waterfall-Proxy-Patches/0004-Fixup-ProtocolConstants.patch
+++ b/Waterfall-Proxy-Patches/0004-Fixup-ProtocolConstants.patch
@ -1,16 +1,16 @@
-From 2d5662b851b99d412b9675c75301ac484041515a Mon Sep 17 00:00:00 2001
+From 179427338a7ff368e78dc222ae9769533be34329 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 ac9adf33..a9398eef 100644
+index bba6cb2d..673da608 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
-@@ -24,7 +24,8 @@ public class ProtocolConstants
-             "1.11.x",
-             "1.12.x"
+@@ -26,7 +26,8 @@ public class ProtocolConstants
+             "1.12.x",
+             "1.13.x"
     );
 -    public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList( ProtocolConstants.MINECRAFT_1_8,
 +    public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
@ -18,8 +18,8 @@ index ac9adf33..a9398eef 100644
             ProtocolConstants.MINECRAFT_1_9,
             ProtocolConstants.MINECRAFT_1_9_1,
             ProtocolConstants.MINECRAFT_1_9_2,
-@@ -37,6 +38,16 @@ public class ProtocolConstants
-             ProtocolConstants.MINECRAFT_1_12_2
+@@ -40,6 +41,16 @@ public class ProtocolConstants
+             ProtocolConstants.MINECRAFT_1_13
     );
 
 +    public static final boolean isBeforeOrEq(int before, int other)
@ -36,5 +36,5 @@ index ac9adf33..a9398eef 100644
     {
 
 -- 
-2.14.2
+2.18.0

--- a/Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
+++ b/Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
@ -1,4 +1,4 @@
-From 87f901329e7a7fdb15fd1a125152bb77fff7aaeb Mon Sep 17 00:00:00 2001
+From b91bff82ac6a3902a3f8a27987da26d926cd2aa5 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 10:31:04 -0500
 Subject: [PATCH] 1.7.x Protocol Patch
@ -129,7 +129,7 @@ index 10e16d79..04a34033 100644
 
     @Override
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index 0b780e2e..a38d8019 100644
+index 9e9ea49c..75b0f8a9 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -5,10 +5,11 @@ import io.netty.buffer.ByteBufUtil;
@ -167,19 +167,19 @@ index d4b03843..9aac7ca9 100644
     }
 }
 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 97aacd00..120bfed1 100644
+index a8ac332a..6fd624ae 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
-@@ -346,6 +346,8 @@ public enum Protocol
+@@ -384,6 +384,8 @@ public enum Protocol
         private final TIntObjectMap<List<Integer>> linkedProtocols = new TIntObjectHashMap<>();
         {
             linkedProtocols.put( ProtocolConstants.MINECRAFT_1_8, Arrays.asList(
 +                    ProtocolConstants.MINECRAFT_1_7_2,
 +                    ProtocolConstants.MINECRAFT_1_7_6,
                     ProtocolConstants.MINECRAFT_1_9,
-                     ProtocolConstants.MINECRAFT_1_12
-             ) );
-@@ -398,7 +400,11 @@ public enum Protocol
+                     ProtocolConstants.MINECRAFT_1_12,
+                     ProtocolConstants.MINECRAFT_1_13
+@@ -437,7 +439,11 @@ public enum Protocol
             }
             if ( !hasPacket(id, supportsForge) )
             {
@ -574,7 +574,7 @@ index 00000000..2aa68858
 +    }
 +}
 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 a9398eef..aa801b87 100644
+index 673da608..80438990 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
@@ -6,6 +6,8 @@ import java.util.List;
@ -586,16 +586,16 @@ index a9398eef..aa801b87 100644
     public static final int MINECRAFT_1_8 = 47;
     public static final int MINECRAFT_1_9 = 107;
     public static final int MINECRAFT_1_9_1 = 108;
-@@ -18,6 +20,7 @@ public class ProtocolConstants
-     public static final int MINECRAFT_1_12_1 = 338;
+@@ -19,6 +21,7 @@ public class ProtocolConstants
     public static final int MINECRAFT_1_12_2 = 340;
+     public static final int MINECRAFT_1_13 = 389;
     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
 +            "1.7.x",
             "1.8.x",
             "1.9.x",
             "1.10.x",
-@@ -25,6 +28,8 @@ public class ProtocolConstants
-             "1.12.x"
+@@ -27,6 +30,8 @@ public class ProtocolConstants
+             "1.13.x"
     );
     public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
 +            ProtocolConstants.MINECRAFT_1_7_2,
@ -1125,11 +1125,11 @@ index 9983ef2e..ae5dad52 100644
     public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
 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 756f7c2f..91ff3d03 100644
+index 04644236..029618cf 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
-@@ -2,8 +2,8 @@ package net.md_5.bungee.protocol.packet;
- 
+@@ -3,8 +3,8 @@ package net.md_5.bungee.protocol.packet;
+ import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 +import io.github.waterfallmc.travertine.protocol.MultiVersionPacketV17;
@ -1138,7 +1138,7 @@ index 756f7c2f..91ff3d03 100644
 import io.netty.buffer.ByteBuf;
 import java.io.ByteArrayInputStream;
 import java.io.DataInput;
-@@ -19,7 +19,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
+@@ -21,7 +21,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
@ -1146,8 +1146,8 @@ index 756f7c2f..91ff3d03 100644
 +public class PluginMessage extends MultiVersionPacketV17
 {
 
-     public static final Predicate<PluginMessage> SHOULD_RELAY = new Predicate<PluginMessage>()
-@@ -52,6 +52,15 @@ public class PluginMessage extends DefinedPacket
+     public static final Function<String, String> MODERNISE = new Function<String, String>()
+@@ -79,6 +79,15 @@ public class PluginMessage extends DefinedPacket
      */
     private boolean allowExtendedPacket = false;
 
@ -1163,7 +1163,7 @@ index 756f7c2f..91ff3d03 100644
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
-@@ -62,6 +71,15 @@ public class PluginMessage extends DefinedPacket
+@@ -89,6 +98,15 @@ public class PluginMessage extends DefinedPacket
         buf.readBytes( data );
     }
 
@ -1180,7 +1180,7 @@ index 756f7c2f..91ff3d03 100644
     public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
-index ef9b8cf6..43af3189 100644
+index 6279d9f3..6c238edf 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardObjective.java
@@ -1,6 +1,6 @@
@ -1189,9 +1189,9 @@ index ef9b8cf6..43af3189 100644
 -import net.md_5.bungee.protocol.DefinedPacket;
 +import io.github.waterfallmc.travertine.protocol.MultiVersionPacketV17;
 import io.netty.buffer.ByteBuf;
+ import java.util.Locale;
 import lombok.AllArgsConstructor;
- import lombok.Data;
-@@ -13,7 +13,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
+@@ -14,7 +14,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
 @NoArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
@ -1200,7 +1200,7 @@ index ef9b8cf6..43af3189 100644
 {
 
     private String name;
-@@ -24,6 +24,16 @@ public class ScoreboardObjective extends DefinedPacket
+@@ -25,6 +25,16 @@ public class ScoreboardObjective extends DefinedPacket
      */
     private byte action;
 
@ -1217,7 +1217,7 @@ index ef9b8cf6..43af3189 100644
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
-@@ -36,6 +46,16 @@ public class ScoreboardObjective extends DefinedPacket
+@@ -43,6 +53,16 @@ public class ScoreboardObjective extends DefinedPacket
         }
     }
 
@ -1298,7 +1298,7 @@ index 6f0de535..b967f89f 100644
     public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
-index e3bcbc33..7634ebfd 100644
+index f9eaa7ce..e174ac0b 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/TabCompleteRequest.java
@@ -1,6 +1,6 @@
@ -1307,21 +1307,21 @@ index e3bcbc33..7634ebfd 100644
 -import net.md_5.bungee.protocol.DefinedPacket;
 +import io.github.waterfallmc.travertine.protocol.MultiVersionPacketV17;
 import io.netty.buffer.ByteBuf;
- import lombok.AllArgsConstructor;
 import lombok.Data;
-@@ -13,7 +13,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
+ import lombok.EqualsAndHashCode;
+@@ -11,7 +11,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
+ @Data
 @NoArgsConstructor
- @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 -public class TabCompleteRequest extends DefinedPacket
 +public class TabCompleteRequest extends MultiVersionPacketV17
 {
 
-     private String cursor;
-@@ -21,6 +21,14 @@ public class TabCompleteRequest extends DefinedPacket
-     private boolean hasPositon;
-     private long position;
- 
+     private int transactionId;
+@@ -33,6 +33,13 @@ public class TabCompleteRequest extends DefinedPacket
+         this.hasPositon = hasPosition;
+         this.position = position;
+     }
 +    // Travertine start
 +    @Override
 +    public void v17Read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
@ -1329,11 +1329,10 @@ index e3bcbc33..7634ebfd 100644
 +        cursor = readString( buf );
 +    }
 +    // Travertine end
-+
+ 
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
-     {
-@@ -36,6 +44,14 @@ public class TabCompleteRequest extends DefinedPacket
+@@ -57,6 +64,14 @@ public class TabCompleteRequest extends DefinedPacket
         }
     }
 
@ -1349,7 +1348,7 @@ index e3bcbc33..7634ebfd 100644
     public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
-index b4705799..da1066cc 100644
+index f93508d9..74d6c0db 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Team.java
@@ -1,6 +1,6 @@
@ -1401,7 +1400,7 @@ index b4705799..da1066cc 100644
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
-@@ -68,6 +93,30 @@ public class Team extends DefinedPacket
+@@ -76,6 +101,30 @@ public class Team extends DefinedPacket
         }
     }
 
@ -1433,7 +1432,7 @@ index b4705799..da1066cc 100644
     public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
 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 c62bc9ba..cb0bc3ef 100644
+index 83b7d8ba..57afcbbe 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -163,6 +163,14 @@ public class BungeeCord extends ProxyServer
@ -1527,7 +1526,7 @@ index 491cf1a1..299a216c 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 9c6fa440..87ee1b0a 100644
+index 0937c39d..94c8f142 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -3,6 +3,8 @@ package net.md_5.bungee;
@ -1539,21 +1538,13 @@ index 9c6fa440..87ee1b0a 100644
 import java.util.Arrays;
 import java.util.Queue;
 import java.util.Set;
-@@ -34,6 +36,7 @@ import net.md_5.bungee.netty.PipelineUtils;
- import net.md_5.bungee.protocol.DefinedPacket;
- import net.md_5.bungee.protocol.MinecraftDecoder;
- import net.md_5.bungee.protocol.Protocol;
-+import net.md_5.bungee.protocol.ProtocolConstants;
- import net.md_5.bungee.protocol.packet.EncryptionRequest;
- import net.md_5.bungee.protocol.packet.Handshake;
- import net.md_5.bungee.protocol.packet.Kick;
-@@ -232,10 +235,20 @@ public class ServerConnector extends PacketHandler
+@@ -245,10 +247,20 @@ public class ServerConnector extends PacketHandler
 
             user.unsafe().sendPacket( modLogin );
 
 -            ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
 -            DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
-            user.unsafe().sendPacket( new PluginMessage( "MC|Brand", brand, handshakeHandler.isServerForge() ) );
+-            user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", brand, handshakeHandler.isServerForge() ) );
 -            brand.release();
 +            // Travertine start
 +            String brandString = bungee.getName() + " (" + bungee.getVersion() + ")";
@ -1565,14 +1556,14 @@ index 9c6fa440..87ee1b0a 100644
 +            {
 +                ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
 +                DefinedPacket.writeString(brandString, brand);
-+                user.unsafe().sendPacket(new PluginMessage("MC|Brand", brand, handshakeHandler.isServerForge()));
+                user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", brand, handshakeHandler.isServerForge() ) );
 +                brand.release();
 +            }
 +            // Travertine end
 
             user.setDimension( login.getDimension() );
         } else
-@@ -379,14 +392,23 @@ public class ServerConnector extends PacketHandler
+@@ -392,14 +404,23 @@ public class ServerConnector extends PacketHandler
             {
                 this.handshakeHandler.handle( pluginMessage );
 
@ -1655,20 +1646,12 @@ index ef12a019..4a1c3638 100644
         {
             this.compressionThreshold = compressionThreshold;
 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 1edb9439..5e847718 100644
+index 287a42bd..89eb3ba4 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
-@@ -31,6 +31,7 @@ import net.md_5.bungee.netty.ChannelWrapper;
- import net.md_5.bungee.netty.PacketHandler;
- import net.md_5.bungee.protocol.DefinedPacket;
- 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.EntityEffect;
- import net.md_5.bungee.protocol.packet.EntityRemoveEffect;
-@@ -250,16 +251,28 @@ public class DownstreamBridge extends PacketHandler
+@@ -251,16 +251,28 @@ public class DownstreamBridge extends PacketHandler
 
-         if ( pluginMessage.getTag().equals( "MC|Brand" ) )
+         if ( pluginMessage.getTag().equals( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand" ) )
         {
 -            ByteBuf brand = Unpooled.wrappedBuffer( pluginMessage.getData() );
 -            String serverBrand = DefinedPacket.readString( brand );
@ -1706,7 +1689,7 @@ index 1edb9439..5e847718 100644
             con.unsafe().sendPacket( pluginMessage );
             throw CancelSendSignal.INSTANCE;
 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 1accd61d..9916c2b3 100644
+index c6e109c5..adcdd31c 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
@@ -13,6 +13,13 @@ import java.util.UUID;
@ -1723,7 +1706,7 @@ index 1accd61d..9916c2b3 100644
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.BungeeCord;
-@@ -223,8 +230,24 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -234,8 +241,24 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                     @Override
                     public void done(ProxyPingEvent pingResult, Throwable error)
                     {
@ -1750,7 +1733,7 @@ index 1accd61d..9916c2b3 100644
                     }
                 };
 
-@@ -510,7 +533,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -521,7 +544,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
                             userCon.setCompressionThreshold( BungeeCord.getInstance().config.getCompressionThreshold() );
                             userCon.init();
 
@ -1768,18 +1751,18 @@ index 1accd61d..9916c2b3 100644
 
                             ch.getHandle().pipeline().get( HandlerBoss.class ).setHandler( new UpstreamBridge( bungee, userCon ) );
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
-index 3cd5cf69..ff30b61a 100644
+index 76f496ce..eab2523d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/PingHandler.java
-@@ -14,6 +14,7 @@ import net.md_5.bungee.netty.PipelineUtils;
- import net.md_5.bungee.protocol.MinecraftDecoder;
+@@ -15,6 +15,7 @@ import net.md_5.bungee.protocol.MinecraftDecoder;
 import net.md_5.bungee.protocol.MinecraftEncoder;
+ import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.Protocol;
 +import net.md_5.bungee.protocol.ProtocolConstants;
 import net.md_5.bungee.protocol.packet.Handshake;
 import net.md_5.bungee.protocol.packet.StatusRequest;
 import net.md_5.bungee.protocol.packet.StatusResponse;
-@@ -52,7 +53,7 @@ public class PingHandler extends PacketHandler
+@@ -63,7 +64,7 @@ public class PingHandler extends PacketHandler
     @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR")
     public void handle(StatusResponse statusResponse) throws Exception
     {
@ -1789,7 +1772,7 @@ index 3cd5cf69..ff30b61a 100644
         channel.close();
     }
 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 09b1de2b..08a6eac3 100644
+index 719ad409..a5c798f4 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
@@ -79,7 +79,12 @@ public class UpstreamBridge extends PacketHandler
@ -1807,7 +1790,7 @@ index 09b1de2b..08a6eac3 100644
             con.getServer().disconnect( "Quitting" );
         }
 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 27ee21f2..64649c7c 100644
+index bad9773b..45716724 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
@@ -29,6 +29,10 @@ public abstract class EntityMap
@ -2397,5 +2380,5 @@ index daf12f74..e33861ab 100644
 
     @Override
 -- 
-2.17.1
+2.18.0

--- a/Waterfall-Proxy-Patches/0006-Add-temp-1.13-release-support.patch
+++ b/Waterfall-Proxy-Patches/0006-Add-temp-1.13-release-support.patch
@ -0,0 +1,119 @@
+From 1d3be20bca21b81ea3552c80e680fb9a71c6b6f8 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Fri, 20 Jul 2018 03:54:51 +0100
+Subject: [PATCH] Add temp 1.13 release support
+
+To be dropped when upstream releases final support for 1.13
+
+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 6fd624ae..69074fe1 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
+@@ -267,42 +267,50 @@ public enum Protocol
+         {
+             TO_CLIENT.registerPacket(
+                     LoginPayloadRequest.class,
+-                    map( ProtocolConstants.MINECRAFT_1_13, 0x00 )
+                    map( ProtocolConstants.MINECRAFT_1_13, 0x00 ),
+                    map( ProtocolConstants.MINECRAFT_1_13_R, 0x03 ) // Travertine - 1.13
+             );
+             TO_CLIENT.registerPacket(
+                     Kick.class,
+                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
+-                    map( ProtocolConstants.MINECRAFT_1_13, 0x01 )
+                    map( ProtocolConstants.MINECRAFT_1_13, 0x01 ),
+                    map( ProtocolConstants.MINECRAFT_1_13_R, 0x00 ) // Travertine - 1.13
+             );
+             TO_CLIENT.registerPacket(
+                     EncryptionRequest.class,
+                     map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
+-                    map( ProtocolConstants.MINECRAFT_1_13, 0x02 )
+                    map( ProtocolConstants.MINECRAFT_1_13, 0x02 ),
+                    map( ProtocolConstants.MINECRAFT_1_13_R, 0x01 ) // Travertine - 1.13
+             );
+             TO_CLIENT.registerPacket(
+                     LoginSuccess.class,
+                     map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
+-                    map( ProtocolConstants.MINECRAFT_1_13, 0x03 )
+                    map( ProtocolConstants.MINECRAFT_1_13, 0x03 ),
+                    map( ProtocolConstants.MINECRAFT_1_13_R, 0x02 ) // Travertine - 1.13
+             );
+             TO_CLIENT.registerPacket(
+                     SetCompression.class,
+                     map( ProtocolConstants.MINECRAFT_1_8, 0x03 ),
+-                    map( ProtocolConstants.MINECRAFT_1_13, 0x04 )
+                    map( ProtocolConstants.MINECRAFT_1_13, 0x04 ),
+                    map( ProtocolConstants.MINECRAFT_1_13_R, 0x03 ) // Travertine - 1.13
+             );
+ 
+             TO_SERVER.registerPacket(
+                     LoginPayloadResponse.class,
+-                    map( ProtocolConstants.MINECRAFT_1_13, 0x00 )
+                    map( ProtocolConstants.MINECRAFT_1_13, 0x00 ),
+                    map( ProtocolConstants.MINECRAFT_1_13, 0x02 ) // Travertine - 1.13
+             );
+             TO_SERVER.registerPacket(
+                     LoginRequest.class,
+                     map( ProtocolConstants.MINECRAFT_1_8, 0x00 ),
+-                    map( ProtocolConstants.MINECRAFT_1_13, 0x01 )
+                    map( ProtocolConstants.MINECRAFT_1_13, 0x01 ),
+                    map( ProtocolConstants.MINECRAFT_1_13_R, 0x00 ) // Travertine - 1.13
+             );
+             TO_SERVER.registerPacket(
+                     EncryptionResponse.class,
+                     map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
+-                    map( ProtocolConstants.MINECRAFT_1_13, 0x02 )
+                    map( ProtocolConstants.MINECRAFT_1_13, 0x02 ),
+                    map( ProtocolConstants.MINECRAFT_1_13_R, 0x01 ) // Travertine - 1.13
+             );
+         }
+     };
+@@ -406,6 +414,11 @@ public enum Protocol
+             linkedProtocols.put( ProtocolConstants.MINECRAFT_1_12_1, Arrays.asList(
+                     ProtocolConstants.MINECRAFT_1_12_2
+             ) );
+            // Travertine start - 1.13
+            linkedProtocols.put (ProtocolConstants.MINECRAFT_1_13_R, Arrays.asList(
+                    ProtocolConstants.MINECRAFT_1_13
+            ));
+            // Travertine end - 1.13
+         }
+ 
+         @Getter
+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 80438990..292fece6 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
+@@ -20,6 +20,7 @@ public class ProtocolConstants
+     public static final int MINECRAFT_1_12_1 = 338;
+     public static final int MINECRAFT_1_12_2 = 340;
+     public static final int MINECRAFT_1_13 = 389;
+    public static final int MINECRAFT_1_13_R = 393;
+     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
+             "1.7.x",
+             "1.8.x",
+@@ -43,7 +44,8 @@ public class ProtocolConstants
+             ProtocolConstants.MINECRAFT_1_12,
+             ProtocolConstants.MINECRAFT_1_12_1,
+             ProtocolConstants.MINECRAFT_1_12_2,
+-            ProtocolConstants.MINECRAFT_1_13
+            ProtocolConstants.MINECRAFT_1_13,
+            ProtocolConstants.MINECRAFT_1_13_R
+     );
+ 
+     public static final boolean isBeforeOrEq(int before, int other)
+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 45716724..1e5f223f 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
+@@ -52,6 +52,7 @@ public abstract class EntityMap
+             case ProtocolConstants.MINECRAFT_1_12_2:
+                 return EntityMap_1_12_1.INSTANCE;
+             case ProtocolConstants.MINECRAFT_1_13:
+            case ProtocolConstants.MINECRAFT_1_13_R:
+                 return EntityMap_1_13.INSTANCE;
+         }
+         throw new RuntimeException( "Version " + version + " has no entity map" );
+-- 
+2.18.0
+