Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-04-13 15:25:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge upstream - Minecraft 1.13.1 support

Browse Source
This commit is contained in:
Shane Freeder 2018-08-23 22:58:34 +01:00
parent 88bbba2f39
commit 6deaa1c15c
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 0ad854354699e52f87e8d6ace91596866102d1c7
Subproject commit 6125c28a94909d003334133ecc776f85b22cb65c

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

@ -1,11 +1,11 @@
From fa3d391ce01cae6c908695b0654fbd97d8a38610 Mon Sep 17 00:00:00 2001
From 46fd98cefdf9176f9c7bcf922aaf17082f6378aa 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 0e46cbbe..6058e11c 100644
index 0e46cbbe0..6058e11c7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -5,41 +5,41 @@
@ -58,7 +58,7 @@ index 0e46cbbe..6058e11c 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index e7bc7a5d..21990c32 100644
index e7bc7a5d9..21990c32f 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -5,18 +5,18 @@
@ -103,7 +103,7 @@ index e7bc7a5d..21990c32 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/chat/pom.xml b/chat/pom.xml
index 31b98b7d..f6c21ff4 100644
index c9328ac3d..04daec408 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -5,18 +5,18 @@
@ -127,10 +127,10 @@ index 31b98b7d..f6c21ff4 100644
+ <name>Travertine-Chat</name>
+ <description>Minecraft JSON chat API intended for use with Travertine</description>
<properties>
<!-- Require Java 8, not Java 6 -->
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index febc4af0..52fbf681 100644
index febc4af05..52fbf681c 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -5,18 +5,18 @@
@ -157,7 +157,7 @@ index febc4af0..52fbf681 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index e778b3d9..de500af7 100644
index e778b3d98..de500af7c 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -5,16 +5,16 @@
@ -182,7 +182,7 @@ index e778b3d9..de500af7 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 e24b3e40..95dd1a83 100644
index e24b3e409..95dd1a833 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -5,18 +5,18 @@
@ -218,7 +218,7 @@ index e24b3e40..95dd1a83 100644
<scope>compile</scope>
</dependency>
diff --git a/log4j/pom.xml b/log4j/pom.xml
index a085a39c..87ee1371 100644
index a085a39cb..87ee1371a 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -4,17 +4,17 @@
@ -268,7 +268,7 @@ index a085a39c..87ee1371 100644
</dependencies>
</project>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index db149339..f05130e7 100644
index db1493399..f05130e72 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -5,13 +5,13 @@
@ -288,7 +288,7 @@ index db149339..f05130e7 100644
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index c8d9826d..7f8340e9 100644
index c8d9826d3..7f8340e99 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -5,13 +5,13 @@
@ -308,7 +308,7 @@ index c8d9826d..7f8340e9 100644
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 461b26ee..8cdacf0a 100644
index 461b26ee8..8cdacf0a9 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -5,13 +5,13 @@
@ -328,7 +328,7 @@ index 461b26ee..8cdacf0a 100644
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 1b687b3c..85de8def 100644
index 1b687b3ce..85de8defd 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -5,13 +5,13 @@
@ -348,7 +348,7 @@ index 1b687b3c..85de8def 100644
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index 9bdc3aba..a6c6d277 100644
index 9bdc3aba9..a6c6d277e 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -5,13 +5,13 @@
@ -368,7 +368,7 @@ index 9bdc3aba..a6c6d277 100644
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index 6bed2ea0..c72d3ecd 100644
index 6bed2ea0b..c72d3ecdd 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -5,18 +5,18 @@
@ -404,7 +404,7 @@ index 6bed2ea0..c72d3ecd 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index ca9a7c61..78576a53 100644
index ca9a7c616..78576a538 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -5,13 +5,13 @@
@ -424,7 +424,7 @@ index ca9a7c61..78576a53 100644
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index 7073b404..15fa568a 100644
index 7073b4040..15fa568a7 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -5,18 +5,18 @@
@ -451,7 +451,7 @@ index 7073b404..15fa568a 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 0183bf9c..af6d5a97 100644
index 0183bf9c5..af6d5a97c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,19 +5,19 @@
@ -503,7 +503,7 @@ index 0183bf9c..af6d5a97 100644
<distributionManagement>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 333ae1e8..88ddcfb9 100644
index 333ae1e82..88ddcfb9e 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -5,23 +5,23 @@
@ -536,7 +536,7 @@ index 333ae1e8..88ddcfb9 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 2fa860e1..73508887 100644
index df84d6f19..f25ee27ec 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -5,17 +5,17 @@
@ -615,7 +615,7 @@ index 2fa860e1..73508887 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index 4ae682ee..c8f62a78 100644
index 4ae682ee5..c8f62a78f 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -5,18 +5,18 @@

10
Waterfall-Proxy-Patches/0003-Fixup-ProtocolConstants.patch
View File

@ -1,14 +1,14 @@
From 5adbaea1b5db0b403749e7f4c9a5c0ebe7c2df67 Mon Sep 17 00:00:00 2001
From 4033d93513ee20e5f9597062fef36a7f576cdaf6 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 b2dc9423..c23b1947 100644
index 9a61fa4cf..ab949b4d6 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
@@ -26,7 +26,8 @@ public class ProtocolConstants
@@ -27,7 +27,8 @@ public class ProtocolConstants
"1.12.x",
"1.13.x"
);
@ -18,8 +18,8 @@ index b2dc9423..c23b1947 100644
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_9_1,
ProtocolConstants.MINECRAFT_1_9_2,
@@ -40,6 +41,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_13
@@ -42,6 +43,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_13_1
);
+ public static final boolean isBeforeOrEq(int before, int other)

16
Waterfall-Proxy-Patches/0004-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From 29bee8a700e22921c0fba12ca832966b943920fb Mon Sep 17 00:00:00 2001
From 552d8daf36daf5a6dbb1c7f93f0684c188629a52 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 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 8e40682c0..eba86548a 100644
index c3c463998..aaee9df74 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
@@ -378,6 +378,8 @@ public enum Protocol
@ -179,7 +179,7 @@ index 8e40682c0..eba86548a 100644
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_12,
ProtocolConstants.MINECRAFT_1_13
@@ -431,7 +433,11 @@ public enum Protocol
@@ -434,7 +436,11 @@ public enum Protocol
}
if ( !hasPacket(id, supportsForge) )
{
@ -193,7 +193,7 @@ index 8e40682c0..eba86548a 100644
Constructor<? extends DefinedPacket> constructor = protocolData.packetConstructors[id];
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 c23b19478..b461e94e3 100644
index ab949b4d6..9091f6c1e 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;
@ -205,15 +205,15 @@ index c23b19478..b461e94e3 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;
@@ -19,6 +21,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_12_2 = 340;
@@ -20,6 +22,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_13 = 393;
public static final int MINECRAFT_1_13_1 = 401;
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
+ "1.7.x",
"1.8.x",
"1.9.x",
"1.10.x",
@@ -27,6 +30,8 @@ public class ProtocolConstants
@@ -28,6 +31,8 @@ public class ProtocolConstants
"1.13.x"
);
public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
@ -1381,7 +1381,7 @@ index 7129f5e7e..6440db3a6 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 4df061191..b1d2714ca 100644
index 2843b94ea..31ce6712b 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