Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-01-14 03:31:23 +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:
360fdcf Updated Upstream (BungeeCord)
61508bf fix derp in protocol mapping again
52291f0 Fix Entity effect packet mappings
d61b93a Updated Upstream (BungeeCord)
b3296ad Disable metadata rewriting for 1.16 (#520)
29b6e01 Preliminary 1.16 support (#494)
This commit is contained in:
Mariaum 2020-06-24 00:52:32 -03:00 committed by Shane Freeder
parent 726a927792
commit a5899209c8
3 changed files with 180 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 3a8916d9a3e38e95cb0a77dbe079bafe9c3d8c54
Subproject commit 360fdcf5317b3cf91dfae73ed4ad837f6d72c7bc

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

@ -1,11 +1,11 @@
From 3a683289d2b30883aafa06304a847bd0fc0630b5 Mon Sep 17 00:00:00 2001
From e13138d3e5636e9edf39002c54748cbbac6380d9 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 705b7279..08395f48 100644
index dc9c887f..46a14490 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -5,41 +5,41 @@
@ -14,14 +14,14 @@ index 705b7279..08395f48 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-api</artifactId>
+ <artifactId>travertine-api</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-API</name>
@ -58,7 +58,7 @@ index 705b7279..08395f48 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 2876d8d6..6ac1da55 100644
index c291560d..bea97efa 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -5,18 +5,18 @@
@ -67,14 +67,14 @@ index 2876d8d6..6ac1da55 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-bootstrap</artifactId>
+ <artifactId>travertine-bootstrap</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Bootstrap</name>
@ -102,23 +102,23 @@ index 2876d8d6..6ac1da55 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/chat/pom.xml b/chat/pom.xml
index 0bd76ea5..3cbe1abf 100644
index bc8eab68..665da58e 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -5,18 +5,18 @@
@@ -6,18 +6,18 @@
<parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-chat</artifactId>
+ <artifactId>travertine-chat</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Chat</name>
@ -129,7 +129,7 @@ index 0bd76ea5..3cbe1abf 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 4bf7237f..3e2b707b 100644
index c12f6f81..001c9882 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -5,18 +5,18 @@
@ -138,14 +138,14 @@ index 4bf7237f..3e2b707b 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-config</artifactId>
+ <artifactId>travertine-config</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Config</name>
@ -156,7 +156,7 @@ index 4bf7237f..3e2b707b 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 5eb97c1f..0be68542 100644
index 9537382c..5599a7a8 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -5,16 +5,16 @@
@ -165,14 +165,14 @@ index 5eb97c1f..0be68542 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-event</artifactId>
+ <artifactId>travertine-event</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Event</name>
@ -181,7 +181,7 @@ index 5eb97c1f..0be68542 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 23dacb1d..b4520832 100644
index 063232fb..25a6d78f 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -5,18 +5,18 @@
@ -190,14 +190,14 @@ index 23dacb1d..b4520832 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log</artifactId>
+ <artifactId>travertine-log</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Log</name>
@ -217,7 +217,7 @@ index 23dacb1d..b4520832 100644
<scope>compile</scope>
</dependency>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index f5267567..acb4a43d 100644
index e9d935ef..139dc03d 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -4,17 +4,17 @@
@ -226,14 +226,14 @@ index f5267567..acb4a43d 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-log4j</artifactId>
+ <artifactId>travertine-log4j</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Log</name>
@ -267,7 +267,7 @@ index f5267567..acb4a43d 100644
</dependencies>
</project>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 9340d58a..a881b245 100644
index 1ae342d3..705cb0d7 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -5,13 +5,13 @@
@ -276,18 +276,18 @@ index 9340d58a..a881b245 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-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.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index c7106fe9..a54d6029 100644
index 8c594f47..54e80ea6 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -5,13 +5,13 @@
@ -296,18 +296,18 @@ index c7106fe9..a54d6029 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-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.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index e14d18e7..9bb18c7d 100644
index 52c500da..27699883 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -5,13 +5,13 @@
@ -316,18 +316,18 @@ index e14d18e7..9bb18c7d 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-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.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 68f526b1..5753b492 100644
index a8da255b..3e321040 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -5,13 +5,13 @@
@ -336,18 +336,18 @@ index 68f526b1..5753b492 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-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.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index d8ebf472..5c457f76 100644
index 04122421..94ea5e4e 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -5,13 +5,13 @@
@ -356,18 +356,18 @@ index d8ebf472..5c457f76 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-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.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index 261c8d75..b60e8ecc 100644
index 59b62472..287fa74c 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -5,18 +5,18 @@
@ -376,14 +376,14 @@ index 261c8d75..b60e8ecc 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Waterfall Modules</name>
@ -403,7 +403,7 @@ index 261c8d75..b60e8ecc 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index c29ac52f..4774659f 100644
index 64530b81..0d677df1 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -5,13 +5,13 @@
@ -412,18 +412,18 @@ index c29ac52f..4774659f 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-module</artifactId>
+ <artifactId>travertine-module</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-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.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index f8b549dc..b4459ace 100644
index c5c1f9e3..71a17773 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -5,18 +5,18 @@
@ -432,14 +432,14 @@ index f8b549dc..b4459ace 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-native</artifactId>
+ <artifactId>travertine-native</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Native</name>
@ -450,7 +450,7 @@ index f8b549dc..b4459ace 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index c9531d39..8b05cec7 100644
index 570b9ea1..a4216bc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,19 @@
@ -466,7 +466,7 @@ index c9531d39..8b05cec7 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Waterfall-Parent</name>
@ -502,7 +502,7 @@ index c9531d39..8b05cec7 100644
<distributionManagement>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 4592e2b3..0501a835 100644
index 04196782..41bd7f9e 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -5,18 +5,18 @@
@ -511,14 +511,14 @@ index 4592e2b3..0501a835 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-protocol</artifactId>
+ <artifactId>travertine-protocol</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Protocol</name>
@ -538,7 +538,7 @@ index 4592e2b3..0501a835 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 0341a6bc..b95c4b72 100644
index d84b7143..28384f57 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -5,17 +5,17 @@
@ -547,14 +547,14 @@ index 0341a6bc..b95c4b72 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-proxy</artifactId>
+ <artifactId>travertine-proxy</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-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 c3a29122..109574c0 100644
index 352eb37a..a29fe4e9 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -5,18 +5,18 @@
@ -639,14 +639,14 @@ index c3a29122..109574c0 100644
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-parent</artifactId>
+ <artifactId>travertine-parent</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-query</artifactId>
+ <artifactId>travertine-query</artifactId>
<version>1.15-SNAPSHOT</version>
<version>1.16-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Waterfall-Query</name>
@ -666,5 +666,5 @@ index c3a29122..109574c0 100644
<scope>compile</scope>
</dependency>
--
2.26.2
2.17.1

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

@ -1,4 +1,4 @@
From d43a7b391cd61eef81f3d43e41f5d2613291ec2a Mon Sep 17 00:00:00 2001
From 0fcb8dddcb7e2191ddeeeae65fd222f40a2224a1 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
@ -6,7 +6,7 @@ Subject: [PATCH] 1.7.x Protocol Patch
diff --git a/protocol/src/main/java/io/github/waterfallmc/travertine/protocol/MultiVersionPacketV17.java b/protocol/src/main/java/io/github/waterfallmc/travertine/protocol/MultiVersionPacketV17.java
new file mode 100644
index 000000000..90064112e
index 00000000..90064112
--- /dev/null
+++ b/protocol/src/main/java/io/github/waterfallmc/travertine/protocol/MultiVersionPacketV17.java
@@ -0,0 +1,90 @@
@ -101,7 +101,7 @@ index 000000000..90064112e
+ }
+}
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 68c716b9b..3f1bf41e9 100644
index 68c716b9..3f1bf41e 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
@@ -241,6 +241,11 @@ public abstract class DefinedPacket
@ -129,7 +129,7 @@ index 68c716b9b..3f1bf41e9 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 6c3c7ab8d..2fbbd4760 100644
index 6c3c7ab8..2fbbd476 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;
@ -155,7 +155,7 @@ index 6c3c7ab8d..2fbbd4760 100644
if ( in.isReadable() )
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java
index d4b038434..9aac7ca9f 100644
index d4b03843..9aac7ca9 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftEncoder.java
@@ -21,6 +21,6 @@ public class MinecraftEncoder extends MessageToByteEncoder<DefinedPacket>
@ -167,7 +167,7 @@ index d4b038434..9aac7ca9f 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 aa1515f4a..191f0504e 100644
index 546564fb..9d3fa90e 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
@@ -55,7 +55,7 @@ public enum Protocol
@ -188,7 +188,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x1F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x21 ),
map( ProtocolConstants.MINECRAFT_1_14, 0x20 ),
@@ -76,7 +76,7 @@ public enum Protocol
@@ -77,7 +77,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Login.class,
Login::new, // Waterfall - speed up packet construction
@ -196,8 +196,8 @@ index aa1515f4a..191f0504e 100644
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x01 ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x23 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x25 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x26 )
@@ -84,7 +84,7 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_15, 0x26 ),
@@ -86,7 +86,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Chat.class,
Chat::new, // Waterfall - speed up packet construction
@ -205,8 +205,8 @@ index aa1515f4a..191f0504e 100644
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x02 ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x0F ),
map( ProtocolConstants.MINECRAFT_1_13, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_15, 0x0F )
@@ -92,7 +92,7 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_15, 0x0F ),
@@ -95,7 +95,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Respawn.class,
Respawn::new, // Waterfall - speed up packet construction
@ -215,7 +215,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x33 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x34 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x35 ),
@@ -110,7 +110,7 @@ public enum Protocol
@@ -115,7 +115,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
EntityEffect.class,
EntityEffect::new, // Waterfall - speed up packet construction
@ -224,7 +224,7 @@ index aa1515f4a..191f0504e 100644
map(ProtocolConstants.MINECRAFT_1_9, 0x4C),
map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B),
map(ProtocolConstants.MINECRAFT_1_12, 0x4E),
@@ -122,7 +122,7 @@ public enum Protocol
@@ -128,7 +128,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
EntityRemoveEffect.class,
EntityRemoveEffect::new, // Waterfall - speed up packet construction
@ -233,7 +233,7 @@ index aa1515f4a..191f0504e 100644
map(ProtocolConstants.MINECRAFT_1_9, 0x31),
map(ProtocolConstants.MINECRAFT_1_12, 0x32),
map(ProtocolConstants.MINECRAFT_1_12_1, 0x33),
@@ -133,8 +133,7 @@ public enum Protocol
@@ -140,8 +140,7 @@ public enum Protocol
// Waterfall end
TO_CLIENT.registerPacket(
PlayerListItem.class, // PlayerInfo
@ -243,7 +243,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x2D ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x2E ),
map( ProtocolConstants.MINECRAFT_1_13, 0x30 ),
@@ -144,7 +143,7 @@ public enum Protocol
@@ -152,7 +151,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
TabCompleteResponse.class,
TabCompleteResponse::new, // Waterfall - speed up packet construction
@ -251,8 +251,8 @@ index aa1515f4a..191f0504e 100644
+ map( ProtocolConstants.MINECRAFT_1_7_2, 0x3A ), // Travertine
map( ProtocolConstants.MINECRAFT_1_9, 0x0E ),
map( ProtocolConstants.MINECRAFT_1_13, 0x10 ),
map( ProtocolConstants.MINECRAFT_1_15, 0x11 )
@@ -152,7 +151,7 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_15, 0x11 ),
@@ -161,7 +160,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
ScoreboardObjective.class,
ScoreboardObjective::new, // Waterfall - speed up packet construction
@ -261,7 +261,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x3F ),
map( ProtocolConstants.MINECRAFT_1_12, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x42 ),
@@ -163,7 +162,7 @@ public enum Protocol
@@ -172,7 +171,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
ScoreboardScore.class,
ScoreboardScore::new, // Waterfall - speed up packet construction
@ -270,7 +270,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x42 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x44 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x45 ),
@@ -174,7 +173,7 @@ public enum Protocol
@@ -183,7 +182,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
ScoreboardDisplay.class,
ScoreboardDisplay::new, // Waterfall - speed up packet construction
@ -279,7 +279,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x38 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x3A ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x3B ),
@@ -185,7 +184,7 @@ public enum Protocol
@@ -194,7 +193,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Team.class,
Team::new, // Waterfall - speed up packet construction
@ -288,7 +288,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x41 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x43 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x44 ),
@@ -196,7 +195,7 @@ public enum Protocol
@@ -205,7 +204,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
PluginMessage.class,
PluginMessage::new, // Waterfall - speed up packet construction
@ -297,7 +297,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x18 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x19 ),
map( ProtocolConstants.MINECRAFT_1_14, 0x18 ),
@@ -205,7 +204,7 @@ public enum Protocol
@@ -215,7 +214,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Kick.class,
Kick::new, // Waterfall - speed up packet construction
@ -306,7 +306,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x1A ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1B ),
map( ProtocolConstants.MINECRAFT_1_14, 0x1A ),
@@ -214,7 +213,7 @@ public enum Protocol
@@ -225,7 +224,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
Title.class,
Title::new, // Waterfall - speed up packet construction
@ -315,7 +315,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_12, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_13, 0x4B ),
@@ -224,7 +223,7 @@ public enum Protocol
@@ -236,7 +235,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
PlayerListHeaderFooter.class,
PlayerListHeaderFooter::new, // Waterfall - speed up packet construction
@ -324,7 +324,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x48 ),
map( ProtocolConstants.MINECRAFT_1_9_4, 0x47 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x49 ),
@@ -236,7 +235,7 @@ public enum Protocol
@@ -249,7 +248,7 @@ public enum Protocol
TO_CLIENT.registerPacket(
EntityStatus.class,
EntityStatus::new, // Waterfall - speed up packet construction
@ -333,7 +333,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x1B ),
map( ProtocolConstants.MINECRAFT_1_13, 0x1C ),
map( ProtocolConstants.MINECRAFT_1_14, 0x1B ),
@@ -263,7 +262,7 @@ public enum Protocol
@@ -281,7 +280,7 @@ public enum Protocol
TO_SERVER.registerPacket(
KeepAlive.class,
KeepAlive::new, // Waterfall - speed up packet construction
@ -342,7 +342,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x0B ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x0B ),
@@ -273,7 +272,7 @@ public enum Protocol
@@ -292,7 +291,7 @@ public enum Protocol
TO_SERVER.registerPacket(
Chat.class,
Chat::new, // Waterfall - speed up packet construction
@ -351,7 +351,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x03 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x02 ),
@@ -282,7 +281,7 @@ public enum Protocol
@@ -301,7 +300,7 @@ public enum Protocol
TO_SERVER.registerPacket(
TabCompleteRequest.class,
TabCompleteRequest::new, // Waterfall - speed up packet construction
@ -360,7 +360,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x01 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x02 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x01 ),
@@ -292,7 +291,7 @@ public enum Protocol
@@ -311,7 +310,7 @@ public enum Protocol
TO_SERVER.registerPacket(
ClientSettings.class,
ClientSettings::new, // Waterfall - speed up packet construction
@ -369,7 +369,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x04 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x05 ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x04 ),
@@ -301,7 +300,7 @@ public enum Protocol
@@ -320,7 +319,7 @@ public enum Protocol
TO_SERVER.registerPacket(
PluginMessage.class,
PluginMessage::new, // Waterfall - speed up packet construction
@ -378,7 +378,7 @@ index aa1515f4a..191f0504e 100644
map( ProtocolConstants.MINECRAFT_1_9, 0x09 ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0A ),
map( ProtocolConstants.MINECRAFT_1_12_1, 0x09 ),
@@ -318,23 +317,23 @@ public enum Protocol
@@ -337,23 +336,23 @@ public enum Protocol
TO_CLIENT.registerPacket(
StatusResponse.class,
StatusResponse::new, // Waterfall - speed up packet construction
@ -406,7 +406,7 @@ index aa1515f4a..191f0504e 100644
);
}
},
@@ -346,22 +345,22 @@ public enum Protocol
@@ -365,22 +364,22 @@ public enum Protocol
TO_CLIENT.registerPacket(
Kick.class,
Kick::new, // Waterfall - speed up packet construction
@ -433,7 +433,7 @@ index aa1515f4a..191f0504e 100644
);
TO_CLIENT.registerPacket(
LoginPayloadRequest.class,
@@ -372,12 +371,12 @@ public enum Protocol
@@ -391,12 +390,12 @@ public enum Protocol
TO_SERVER.registerPacket(
LoginRequest.class,
LoginRequest::new, // Waterfall - speed up packet construction
@ -448,7 +448,7 @@ index aa1515f4a..191f0504e 100644
);
TO_SERVER.registerPacket(
LoginPayloadResponse.class,
@@ -497,7 +496,11 @@ public enum Protocol
@@ -516,7 +515,11 @@ public enum Protocol
}
if ( !hasPacket(id, supportsForge) )
{
@ -462,7 +462,7 @@ index aa1515f4a..191f0504e 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 cd987c8a8..05f65a800 100644
index 7da62425..bccaf662 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;
@ -474,16 +474,16 @@ index cd987c8a8..05f65a800 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;
@@ -29,6 +31,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_15_1 = 575;
@@ -30,6 +32,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_15_2 = 578;
public static final int MINECRAFT_1_16 = 735;
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
+ "1.7.x",
"1.8.x",
"1.9.x",
"1.10.x",
@@ -39,6 +42,8 @@ public class ProtocolConstants
"1.15.x"
@@ -41,6 +44,8 @@ public class ProtocolConstants
"1.16.x"
);
public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
+ ProtocolConstants.MINECRAFT_1_7_2,
@ -492,7 +492,7 @@ index cd987c8a8..05f65a800 100644
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_9_1,
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 743d65e43..37bf6b4b1 100644
index 743d65e4..37bf6b4b 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
@@ -6,10 +6,12 @@ import io.netty.channel.ChannelHandlerContext;
@ -526,7 +526,7 @@ index 743d65e43..37bf6b4b1 100644
if ( in.readableBytes() < length )
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 0ded67396..e82900c7d 100644
index d2a4dea6..ac47302b 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
@@ -1,5 +1,6 @@
@ -534,9 +534,9 @@ index 0ded67396..e82900c7d 100644
+import io.github.waterfallmc.travertine.protocol.MultiVersionPacketV17;
import io.netty.buffer.ByteBuf;
import java.util.UUID;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -13,7 +14,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
@@ -14,7 +15,7 @@ import net.md_5.bungee.protocol.ProtocolConstants;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ -544,9 +544,9 @@ index 0ded67396..e82900c7d 100644
+public class Chat extends MultiVersionPacketV17
{
private String message;
@@ -24,6 +25,14 @@ public class Chat extends DefinedPacket
this( message, (byte) 0 );
private static final UUID EMPTY_UUID = new UUID( 0L, 0L );
@@ -32,6 +33,14 @@ public class Chat extends DefinedPacket
this( message, position, EMPTY_UUID );
}
+ // Travertine start
@ -560,7 +560,7 @@ index 0ded67396..e82900c7d 100644
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
@@ -39,6 +48,14 @@ public class Chat extends DefinedPacket
@@ -51,6 +60,14 @@ public class Chat extends DefinedPacket
}
}
@ -576,7 +576,7 @@ index 0ded67396..e82900c7d 100644
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java
index 9daf7a737..b7640fcbf 100644
index 9daf7a73..b7640fcb 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientSettings.java
@@ -1,5 +1,7 @@
@ -637,7 +637,7 @@ index 9daf7a737..b7640fcbf 100644
public void handle(AbstractPacketHandler handler) throws Exception
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java
index a29524ca8..8d9f4ccb3 100644
index a29524ca..8d9f4ccb 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java
@@ -1,25 +1,35 @@
@ -696,7 +696,7 @@ index a29524ca8..8d9f4ccb3 100644
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
index 388f6cdb9..7f1243227 100644
index 388f6cdb..7f124322 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
@@ -1,5 +1,6 @@
@ -746,7 +746,7 @@ index 388f6cdb9..7f1243227 100644
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
index d11a9ea9d..07fc21b65 100644
index d11a9ea9..07fc21b6 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
@@ -1,18 +1,19 @@
@ -802,7 +802,7 @@ index d11a9ea9d..07fc21b65 100644
public void write(ByteBuf buf) {
writeVarInt(this.entityId, buf);
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityRemoveEffect.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityRemoveEffect.java
index 7ed2dc3ab..9f8d56fc7 100644
index 7ed2dc3a..9f8d56fc 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityRemoveEffect.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityRemoveEffect.java
@@ -1,18 +1,18 @@
@ -855,7 +855,7 @@ index 7ed2dc3ab..9f8d56fc7 100644
+ }
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/KeepAlive.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/KeepAlive.java
index b004bc416..0c2eb022f 100644
index b004bc41..0c2eb022 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/KeepAlive.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/KeepAlive.java
@@ -1,5 +1,6 @@
@ -900,8 +900,51 @@ index b004bc416..0c2eb022f 100644
@Override
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
index 551bd104..ac8751f6 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginSuccess.java
@@ -23,6 +23,11 @@ public class LoginSuccess extends DefinedPacket
@Override
public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
+ // Travertine start
+ if ( protocolVersion <= ProtocolConstants.MINECRAFT_1_7_2 ) {
+ uuid = readUndashedUUID( buf );
+ } else
+ // Travertine end
if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
{
uuid = readUUID( buf );
@@ -36,6 +41,11 @@ public class LoginSuccess extends DefinedPacket
@Override
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
+ // Travertine start
+ if ( protocolVersion <= ProtocolConstants.MINECRAFT_1_7_2 ) {
+ writeUndashedUUID( uuid.toString(), buf );
+ } else
+ // Travertine end
if ( protocolVersion >= ProtocolConstants.MINECRAFT_1_16 )
{
writeUUID( uuid, buf );
@@ -51,4 +61,14 @@ public class LoginSuccess extends DefinedPacket
{
handler.handle( this );
}
+
+ // Travertine start
+ private static UUID readUndashedUUID(ByteBuf buf) {
+ return UUID.fromString( new StringBuilder( readString( buf ) ).insert( 20, '-' ).insert( 16, '-' ).insert( 12, '-' ).insert( 8, '-' ).toString() );
+ }
+
+ private static void writeUndashedUUID(String uuid, ByteBuf buf) {
+ writeString( new StringBuilder( 32 ).append( uuid, 0, 8 ).append( uuid, 9, 13 ).append( uuid, 14, 18 ).append( uuid, 19, 23 ).append( uuid, 24, 36 ).toString(), buf );
+ }
+ // Travertine end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
index 92bacc7cd..c919f961a 100644
index 92bacc7c..c919f961 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
@@ -1,5 +1,7 @@
@ -957,7 +1000,7 @@ index 92bacc7cd..c919f961a 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 17e12655d..c49c5a567 100644
index 17e12655..c49c5a56 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,8 @@ package net.md_5.bungee.protocol.packet;
@ -1011,7 +1054,7 @@ index 17e12655d..c49c5a567 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 3c7905d54..fe290fa3c 100644
index 3c7905d5..fe290fa3 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,5 +1,6 @@
@ -1065,7 +1108,7 @@ index 3c7905d54..fe290fa3c 100644
public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
{
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
index 0b27fc86b..74066702c 100644
index 0b27fc86..74066702 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ScoreboardScore.java
@@ -1,5 +1,6 @@
@ -1127,7 +1170,7 @@ index 0b27fc86b..74066702c 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 27b232dcb..6c2cef1ee 100644
index 27b232dc..6c2cef1e 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,5 +1,6 @@
@ -1176,7 +1219,7 @@ index 27b232dcb..6c2cef1ee 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 a5555f6af..415a4bcde 100644
index a5555f6a..415a4bcd 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,5 +1,6 @@
@ -1259,7 +1302,7 @@ index a5555f6af..415a4bcde 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 e157374f2..db8e9996c 100644
index e157374f..db8e9996 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -171,6 +171,14 @@ public class BungeeCord extends ProxyServer
@ -1278,7 +1321,7 @@ index e157374f2..db8e9996c 100644
private ConnectionThrottle connectionThrottle;
private final ModuleManager moduleManager = new ModuleManager();
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeTitle.java b/proxy/src/main/java/net/md_5/bungee/BungeeTitle.java
index 494213db8..1d89acf5b 100644
index 494213db..1d89acf5 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeTitle.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeTitle.java
@@ -5,6 +5,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
@ -1298,7 +1341,7 @@ index 494213db8..1d89acf5b 100644
sendPacket( player, reset );
sendPacket( player, times );
diff --git a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
index 491cf1a16..299a216cd 100644
index 491cf1a1..299a216c 100644
--- a/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
+++ b/proxy/src/main/java/net/md_5/bungee/PlayerInfoSerializer.java
@@ -10,17 +10,32 @@ import com.google.gson.JsonSerializer;
@ -1353,7 +1396,7 @@ index 491cf1a16..299a216cd 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 35a19224f..53ef99cd3 100644
index bb4e7ec2..eec0e0e1 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufAllocator;
@ -1398,7 +1441,7 @@ index 35a19224f..53ef99cd3 100644
}
for ( Score score : serverScoreboard.getScores() )
{
@@ -433,6 +444,14 @@ public class ServerConnector extends PacketHandler
@@ -460,6 +471,14 @@ public class ServerConnector extends PacketHandler
{
this.handshakeHandler.handle( pluginMessage );
@ -1414,7 +1457,7 @@ index 35a19224f..53ef99cd3 100644
throw CancelSendSignal.INSTANCE;
}
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 87cff4ffc..4891ec28b 100644
index 4826f0d5..76a91bc4 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -193,6 +193,7 @@ public final class UserConnection implements ProxiedPlayer
@ -1469,7 +1512,7 @@ index 87cff4ffc..4891ec28b 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 daac86045..5fbc61a9f 100644
index daac8604..5fbc61a9 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
@@ -20,6 +20,7 @@ import io.netty.buffer.Unpooled;
@ -1538,7 +1581,7 @@ index daac86045..5fbc61a9f 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 37ea35e30..b1c37a555 100644
index b848e451..f4e0e9bc 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
@@ -12,6 +12,13 @@ import java.util.List;
@ -1586,25 +1629,8 @@ index 37ea35e30..b1c37a555 100644
}
};
@@ -536,7 +559,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
userCon.setCompressionThreshold( BungeeCord.getInstance().config.getCompressionThreshold() );
userCon.init();
- unsafe.sendPacket( new LoginSuccess( getUniqueId().toString(), getName() ) ); // With dashes in between
+ // Travertine start
+ if ( ProtocolConstants.isAfterOrEq( getVersion() , ProtocolConstants.MINECRAFT_1_7_6 ) )
+ {
+ unsafe.sendPacket( new LoginSuccess( getUniqueId().toString(), getName() ) ); // With dashes in between
+ } else
+ {
+ unsafe.sendPacket( new LoginSuccess( getUUID(), getName() ) ); // Without dashes, for older clients.
+ }
+ // Travertine end
ch.setProtocol( Protocol.GAME );
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 6df3f3dd9..6cd71071e 100644
index 6df3f3dd..6cd71071 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
@@ -16,6 +16,7 @@ import net.md_5.bungee.protocol.MinecraftDecoder;
@ -1625,7 +1651,7 @@ index 6df3f3dd9..6cd71071e 100644
( (BungeeServerInfo) target ).cachePing( serverPing );
callback.done( serverPing, null );
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 7913d40cc..0994bebd9 100644
index 7913d40c..0994bebd 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
@@ -84,7 +84,12 @@ public class UpstreamBridge extends PacketHandler
@ -1643,7 +1669,7 @@ index 7913d40cc..0994bebd9 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 bc1de55a2..73b05167d 100644
index ef2a66fa..c8ac14da 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
@ -1659,7 +1685,7 @@ index bc1de55a2..73b05167d 100644
case ProtocolConstants.MINECRAFT_1_9:
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_2.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_2.java
new file mode 100644
index 000000000..65c1a9ec8
index 00000000..65c1a9ec
--- /dev/null
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_2.java
@@ -0,0 +1,102 @@
@ -1767,7 +1793,7 @@ index 000000000..65c1a9ec8
+// Travertine end
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_6.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_6.java
new file mode 100644
index 000000000..6755fe845
index 00000000..6755fe84
--- /dev/null
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap_1_7_6.java
@@ -0,0 +1,62 @@
@ -1834,7 +1860,7 @@ index 000000000..6755fe845
+}
+// Travertine end
diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
index bea2bbff9..f61de1278 100644
index bea2bbff..f61de127 100644
--- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
@@ -8,6 +8,7 @@ import lombok.Getter;
@ -1882,7 +1908,7 @@ index bea2bbff9..f61de1278 100644
+
}
diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandshakeState.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandshakeState.java
index 5e02f8c8a..e3c1b9b95 100644
index 5e02f8c8..e3c1b9b9 100644
--- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandshakeState.java
+++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandshakeState.java
@@ -3,6 +3,7 @@ package net.md_5.bungee.forge;
@ -1917,7 +1943,7 @@ index 5e02f8c8a..e3c1b9b95 100644
return WAITINGSERVERDATA;
diff --git a/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java b/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
index daf12f74e..e33861abb 100644
index daf12f74..e33861ab 100644
--- a/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
+++ b/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
@@ -4,12 +4,14 @@ import java.util.Collection;
@ -2012,5 +2038,5 @@ index daf12f74e..e33861abb 100644
@Override
--
2.27.0
2.17.1