Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-28 03:27:37 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Waterfall)

Browse Source 
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

Waterfall Changes:
6f85738 Rebuild patches
3426625 Updated Upstream (BungeeCord)
f708bf1 Add missing ViewDistance packet supplier (#436)
This commit is contained in:
Shane Freeder 2019-12-10 23:04:38 +00:00
parent d86262647a
commit 6e8f551480
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 105 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 337ca7f887802ae336e3aa441120fc6990319887
Subproject commit 6f85738aaa27482a7f26d1a1a45f82c3a52a8746

116
Waterfall-Proxy-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From 209758b7e6b7783919e3f4a92864a37082956036 Mon Sep 17 00:00:00 2001
From 6b4dd108ebfb13989b4d7e61a96fe8314556107a 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 b79d7ed6..dc49e44f 100644
index 8a67d8a3..24a14986 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -5,41 +5,41 @@
@ -14,14 +14,14 @@ index b79d7ed6..dc49e44f 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-api</artifactId>
+ <artifactId>travertine-api</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-API</name>
@ -58,7 +58,7 @@ index b79d7ed6..dc49e44f 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 487fb3bb..d2f0293d 100644
index 0a27c9f6..5c971ed0 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -5,18 +5,18 @@
@ -67,14 +67,14 @@ index 487fb3bb..d2f0293d 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-bootstrap</artifactId>
+ <artifactId>travertine-bootstrap</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Bootstrap</name>
@ -102,7 +102,7 @@ index 487fb3bb..d2f0293d 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/chat/pom.xml b/chat/pom.xml
index 7ad05abb..7c0f54b2 100644
index 0bd76ea5..3cbe1abf 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -5,18 +5,18 @@
@ -111,14 +111,14 @@ index 7ad05abb..7c0f54b2 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-chat</artifactId>
+ <artifactId>travertine-chat</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Chat</name>
@ -129,7 +129,7 @@ index 7ad05abb..7c0f54b2 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 9d0fe24b..b1b313d4 100644
index 764fcc6b..48184d59 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -5,18 +5,18 @@
@ -138,14 +138,14 @@ index 9d0fe24b..b1b313d4 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-config</artifactId>
+ <artifactId>travertine-config</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Config</name>
@ -156,7 +156,7 @@ index 9d0fe24b..b1b313d4 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index d6efe097..a447a4a5 100644
index 5eb97c1f..0be68542 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -5,16 +5,16 @@
@ -165,14 +165,14 @@ index d6efe097..a447a4a5 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-event</artifactId>
+ <artifactId>travertine-event</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Event</name>
@ -181,7 +181,7 @@ index d6efe097..a447a4a5 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 fd999b51..280b3ceb 100644
index 23dacb1d..b4520832 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -5,18 +5,18 @@
@ -190,14 +190,14 @@ index fd999b51..280b3ceb 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log</artifactId>
+ <artifactId>travertine-log</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Log</name>
@ -217,7 +217,7 @@ index fd999b51..280b3ceb 100644
<scope>compile</scope>
</dependency>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index e03fe0d7..4b04cbda 100644
index f5267567..acb4a43d 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -4,17 +4,17 @@
@ -226,14 +226,14 @@ index e03fe0d7..4b04cbda 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log4j</artifactId>
+ <artifactId>travertine-log4j</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Log</name>
@ -267,7 +267,7 @@ index e03fe0d7..4b04cbda 100644
</dependencies>
</project>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 6f3aa272..5ee87a9a 100644
index 9340d58a..a881b245 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -5,13 +5,13 @@
@ -276,18 +276,18 @@ index 6f3aa272..5ee87a9a 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-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.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 01d95284..af8a7d9c 100644
index c7106fe9..a54d6029 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -5,13 +5,13 @@
@ -296,18 +296,18 @@ index 01d95284..af8a7d9c 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-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.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index bc5dc210..3d055bbc 100644
index e14d18e7..9bb18c7d 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -5,13 +5,13 @@
@ -316,18 +316,18 @@ index bc5dc210..3d055bbc 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-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.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index f6642175..b594da47 100644
index 68f526b1..5753b492 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -5,13 +5,13 @@
@ -336,18 +336,18 @@ index f6642175..b594da47 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-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.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index c93ab2c9..a94a57db 100644
index d8ebf472..5c457f76 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -5,13 +5,13 @@
@ -356,18 +356,18 @@ index c93ab2c9..a94a57db 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-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.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index aa604f35..520df1f0 100644
index 7b05190b..266678f4 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -5,18 +5,18 @@
@ -376,14 +376,14 @@ index aa604f35..520df1f0 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Waterfall Modules</name>
@ -403,7 +403,7 @@ index aa604f35..520df1f0 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index e34bac42..1d82a29b 100644
index c29ac52f..4774659f 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -5,13 +5,13 @@
@ -412,18 +412,18 @@ index e34bac42..1d82a29b 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-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.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index b5aeb99e..67386de0 100644
index f8b549dc..b4459ace 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -5,18 +5,18 @@
@ -432,14 +432,14 @@ index b5aeb99e..67386de0 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-native</artifactId>
+ <artifactId>travertine-native</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Native</name>
@ -450,7 +450,7 @@ index b5aeb99e..67386de0 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 98df957c..54ce1c08 100644
index a89472eb..cf13c377 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,19 @@
@ -466,7 +466,7 @@ index 98df957c..54ce1c08 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Waterfall-Parent</name>
@ -502,7 +502,7 @@ index 98df957c..54ce1c08 100644
<distributionManagement>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 2493fc17..2bd55072 100644
index 4592e2b3..0501a835 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -5,18 +5,18 @@
@ -511,14 +511,14 @@ index 2493fc17..2bd55072 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-protocol</artifactId>
+ <artifactId>travertine-protocol</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Protocol</name>
@ -538,7 +538,7 @@ index 2493fc17..2bd55072 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index f15927ec..2d4e4d79 100644
index 39d6e35e..a53571fc 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -5,17 +5,17 @@
@ -547,14 +547,14 @@ index f15927ec..2d4e4d79 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-proxy</artifactId>
+ <artifactId>travertine-proxy</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Proxy</name>
@ -630,7 +630,7 @@ index 9b20d0df..2637b9e2 100644
// 15 second timeout at various stages
con.setConnectTimeout( 15000 );
diff --git a/query/pom.xml b/query/pom.xml
index 1fd54029..86f7aabc 100644
index c3a29122..109574c0 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -5,18 +5,18 @@
@ -639,14 +639,14 @@ index 1fd54029..86f7aabc 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-query</artifactId>
+ <artifactId>travertine-query</artifactId>
<version>1.14-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Query</name>
@ -666,5 +666,5 @@ index 1fd54029..86f7aabc 100644
<scope>compile</scope>
</dependency>
--
2.21.0
2.24.0

89
Waterfall-Proxy-Patches/0003-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From 38fdbe4c22469bc4803297537fe9f300e49ed576 Mon Sep 17 00:00:00 2001
From 5b47c64fd50db3eb319c197d1fe7652b3e9773bc 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
@ -167,7 +167,7 @@ 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 c2b0e12c..a5999b40 100644
index 44dc34ff..a4ab8a0f 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
@@ -54,7 +54,7 @@ public enum Protocol
@ -187,24 +187,26 @@ index c2b0e12c..a5999b40 100644
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x00 ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x21 ),
map( ProtocolConstants.MINECRAFT_1_14, 0x20 )
@@ -74,21 +74,21 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_14, 0x20 ),
@@ -75,7 +75,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Login.class,
Login::new, // Waterfall - speed up packet construction
- map( ProtocolConstants.MINECRAFT_1_8, 0x01 ),
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x01 ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x23 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x25 )
);
map( ProtocolConstants.MINECRAFT_1_13, 0x25 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x26 )
@@ -83,7 +83,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Chat.class,
Chat::new, // Waterfall - speed up packet construction
- map( ProtocolConstants.MINECRAFT_1_8, 0x02 ),
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x02 ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x0F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x0E )
);
map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_15, 0x0F )
@@ -91,7 +91,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Respawn.class,
Respawn::new, // Waterfall - speed up packet construction
@ -213,7 +215,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x34 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x35 ),
@@ -104,7 +104,7 @@ public enum Protocol
@@ -109,7 +109,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
EntityEffect.class,
EntityEffect::new, // Waterfall - speed up packet construction
@ -222,7 +224,7 @@ index c2b0e12c..a5999b40 100644
map(ProtocolConstants.MINECRAFT_1_9, 0x4C),
map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B),
map(ProtocolConstants.MINECRAFT_1_12, 0x4E),
@@ -115,7 +115,7 @@ public enum Protocol
@@ -121,7 +121,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
EntityRemoveEffect.class,
EntityRemoveEffect::new, // Waterfall - speed up packet construction
@ -231,7 +233,7 @@ index c2b0e12c..a5999b40 100644
map(ProtocolConstants.MINECRAFT_1_9, 0x31),
map(ProtocolConstants.MINECRAFT_1_12, 0x32),
map(ProtocolConstants.MINECRAFT_1_12_1, 0x33),
@@ -125,8 +125,7 @@ public enum Protocol
@@ -132,8 +132,7 @@ public enum Protocol
// Waterfall end
TO_CLIENT.registerPacket(
PlayerListItem.class, // PlayerInfo
@ -241,15 +243,16 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
map( ProtocolConstants.MINECRAFT_1_13, 0x30 ),
@@ -135,14 +134,14 @@ public enum Protocol
@@ -143,7 +142,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
TabCompleteResponse.class,
TabCompleteResponse::new, // Waterfall - speed up packet construction
- map( ProtocolConstants.MINECRAFT_1_8, 0x3A ),
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x3A ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_13, 0x10 )
);
map( ProtocolConstants.MINECRAFT_1_13, 0x10 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x11 )
@@ -151,7 +150,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
ScoreboardObjective.class,
ScoreboardObjective::new, // Waterfall - speed up packet construction
@ -258,7 +261,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_12, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x42 ),
@@ -152,7 +151,7 @@ public enum Protocol
@@ -162,7 +161,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
ScoreboardScore.class,
ScoreboardScore::new, // Waterfall - speed up packet construction
@ -267,7 +270,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x44 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x45 ),
@@ -162,7 +161,7 @@ public enum Protocol
@@ -173,7 +172,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
ScoreboardDisplay.class,
ScoreboardDisplay::new, // Waterfall - speed up packet construction
@ -276,7 +279,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x3A ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x3B ),
@@ -172,7 +171,7 @@ public enum Protocol
@@ -184,7 +183,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Team.class,
Team::new, // Waterfall - speed up packet construction
@ -285,7 +288,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x43 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x44 ),
@@ -182,7 +181,7 @@ public enum Protocol
@@ -195,7 +194,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
PluginMessage.class,
PluginMessage::new, // Waterfall - speed up packet construction
@ -293,8 +296,8 @@ index c2b0e12c..a5999b40 100644
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x3F ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x19 ),
map( ProtocolConstants.MINECRAFT_1_14, 0x18 )
@@ -190,7 +189,7 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_14, 0x18 ),
@@ -204,7 +203,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Kick.class,
Kick::new, // Waterfall - speed up packet construction
@ -302,8 +305,8 @@ index c2b0e12c..a5999b40 100644
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x40 ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1B ),
map( ProtocolConstants.MINECRAFT_1_14, 0x1A )
@@ -198,7 +197,7 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_14, 0x1A ),
@@ -213,7 +212,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Title.class,
Title::new, // Waterfall - speed up packet construction
@ -312,7 +315,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_12, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x4B ),
@@ -207,7 +206,7 @@ public enum Protocol
@@ -223,7 +222,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
PlayerListHeaderFooter.class,
PlayerListHeaderFooter::new, // Waterfall - speed up packet construction
@ -321,7 +324,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x49 ),
@@ -218,7 +217,7 @@ public enum Protocol
@@ -235,7 +234,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
EntityStatus.class,
EntityStatus::new, // Waterfall - speed up packet construction
@ -329,8 +332,8 @@ index c2b0e12c..a5999b40 100644
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x1A ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1C ),
map( ProtocolConstants.MINECRAFT_1_14, 0x1B )
@@ -236,7 +235,7 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_14, 0x1B ),
@@ -257,7 +256,7 @@ public enum Protocol
TO_SERVER.registerPacket(
KeepAlive.class,
KeepAlive::new, // Waterfall - speed up packet construction
@ -339,7 +342,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x0B ),
@@ -246,7 +245,7 @@ public enum Protocol
@@ -267,7 +266,7 @@ public enum Protocol
TO_SERVER.registerPacket(
Chat.class,
Chat::new, // Waterfall - speed up packet construction
@ -348,7 +351,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x03 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x02 ),
@@ -255,7 +254,7 @@ public enum Protocol
@@ -276,7 +275,7 @@ public enum Protocol
TO_SERVER.registerPacket(
TabCompleteRequest.class,
TabCompleteRequest::new, // Waterfall - speed up packet construction
@ -357,7 +360,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x01 ),
@@ -265,7 +264,7 @@ public enum Protocol
@@ -286,7 +285,7 @@ public enum Protocol
TO_SERVER.registerPacket(
ClientSettings.class,
ClientSettings::new, // Waterfall - speed up packet construction
@ -366,7 +369,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x05 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x04 ),
@@ -274,7 +273,7 @@ public enum Protocol
@@ -295,7 +294,7 @@ public enum Protocol
TO_SERVER.registerPacket(
PluginMessage.class,
PluginMessage::new, // Waterfall - speed up packet construction
@ -375,7 +378,7 @@ index c2b0e12c..a5999b40 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0A ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x09 ),
@@ -291,23 +290,23 @@ public enum Protocol
@@ -312,23 +311,23 @@ public enum Protocol
TO_CLIENT.registerPacket(
StatusResponse.class,
StatusResponse::new, // Waterfall - speed up packet construction
@ -403,7 +406,7 @@ index c2b0e12c..a5999b40 100644
);
}
},
@@ -319,22 +318,22 @@ public enum Protocol
@@ -340,22 +339,22 @@ public enum Protocol
TO_CLIENT.registerPacket(
Kick.class,
Kick::new, // Waterfall - speed up packet construction
@ -430,7 +433,7 @@ index c2b0e12c..a5999b40 100644
);
TO_CLIENT.registerPacket(
LoginPayloadRequest.class,
@@ -345,12 +344,12 @@ public enum Protocol
@@ -366,12 +365,12 @@ public enum Protocol
TO_SERVER.registerPacket(
LoginRequest.class,
LoginRequest::new, // Waterfall - speed up packet construction
@ -445,7 +448,7 @@ index c2b0e12c..a5999b40 100644
);
TO_SERVER.registerPacket(
LoginPayloadResponse.class,
@@ -470,7 +469,11 @@ public enum Protocol
@@ -491,7 +490,11 @@ public enum Protocol
}
if ( !hasPacket(id, supportsForge) )
{
@ -459,7 +462,7 @@ index c2b0e12c..a5999b40 100644
java.util.function.Supplier<? extends DefinedPacket> constructor = protocolData.packetConstructors[id]; // Waterfall - speed up packet construction
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 ff1f28aa..ba6faa8d 100644
index c34f6fa2..a3e2379f 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;
@ -471,16 +474,16 @@ index ff1f28aa..ba6faa8d 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;
@@ -26,6 +28,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_14_3 = 490;
@@ -27,6 +29,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_14_4 = 498;
public static final int MINECRAFT_1_15 = 573;
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
+ "1.7.x",
"1.8.x",
"1.9.x",
"1.10.x",
@@ -35,6 +38,8 @@ public class ProtocolConstants
"1.14.x"
@@ -37,6 +40,8 @@ public class ProtocolConstants
"1.15.x"
);
public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
+ ProtocolConstants.MINECRAFT_1_7_2,
@ -1350,7 +1353,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 72f487dc..a92b979a 100644
index 00cd477f..ed53591c 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf;
@ -1395,7 +1398,7 @@ index 72f487dc..a92b979a 100644
}
for ( Score score : serverScoreboard.getScores() )
{
@@ -424,6 +435,14 @@ public class ServerConnector extends PacketHandler
@@ -425,6 +436,14 @@ public class ServerConnector extends PacketHandler
{
this.handshakeHandler.handle( pluginMessage );
@ -1534,7 +1537,7 @@ index 1f8a2439..8e1830e8 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 3a9dab68..ba8fd48e 100644
index 34f7f997..5ef8c7c8 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
@@ -11,6 +11,13 @@ import java.util.List;
@ -1639,7 +1642,7 @@ index 51d0c6cf..35b9530a 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 324a7741..f09dc2aa 100644
index e5d566bd..267e8295 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
@@ -35,6 +35,10 @@ public abstract class EntityMap