Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-11-19 08:45:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream for 1.13.2 (Closes #80)

Browse Source
This commit is contained in:
Shane Freeder 2018-10-23 00:58:52 +01:00
parent e4d5824710
commit 8030568e21
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 22ce5f5012a0ca65ac4d671772a704c52fd127be Subproject commit 38390d14d055b596516e10cfba63ab51336ecf1e

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

@ -1,14 +1,14 @@
From 4033d93513ee20e5f9597062fef36a7f576cdaf6 Mon Sep 17 00:00:00 2001 From f10d44783e5ce0fa36378a20fbdfffc4cd0603fe Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 09:07:51 -0500 Date: Tue, 15 Nov 2016 09:07:51 -0500
Subject: [PATCH] Fixup ProtocolConstants 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 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 9a61fa4cf..ab949b4d6 100644 index 2cc86349..d9a3c7e5 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -27,7 +27,8 @@ public class ProtocolConstants @@ -28,7 +28,8 @@ public class ProtocolConstants
"1.12.x", "1.12.x",
"1.13.x" "1.13.x"
); );
@ -18,8 +18,8 @@ index 9a61fa4cf..ab949b4d6 100644
ProtocolConstants.MINECRAFT_1_9, ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_9_1, ProtocolConstants.MINECRAFT_1_9_1,
ProtocolConstants.MINECRAFT_1_9_2, ProtocolConstants.MINECRAFT_1_9_2,
@@ -42,6 +43,16 @@ public class ProtocolConstants @@ -44,6 +45,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_13_1 ProtocolConstants.MINECRAFT_1_13_2
); );
+ public static final boolean isBeforeOrEq(int before, int other) + public static final boolean isBeforeOrEq(int before, int other)
@ -36,5 +36,5 @@ index 9a61fa4cf..ab949b4d6 100644
{ {
-- --
2.18.0 2.19.1

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

@ -1,4 +1,4 @@
From bfa18231fb8272f226a2f3c10b6542189770101b Mon Sep 17 00:00:00 2001 From 078b41b3d778208738dd528e093aed191aaa670d Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 10:31:04 -0500 Date: Tue, 15 Nov 2016 10:31:04 -0500
Subject: [PATCH] 1.7.x Protocol Patch 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 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 c3c46399..aaee9df7 100644 index cc863d9b..bfa24ffa 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/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 @@ -378,6 +378,8 @@ public enum Protocol
@ -179,7 +179,7 @@ index c3c46399..aaee9df7 100644
ProtocolConstants.MINECRAFT_1_9, ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_12, ProtocolConstants.MINECRAFT_1_12,
ProtocolConstants.MINECRAFT_1_13 ProtocolConstants.MINECRAFT_1_13
@@ -434,7 +436,11 @@ public enum Protocol @@ -435,7 +437,11 @@ public enum Protocol
} }
if ( !hasPacket(id, supportsForge) ) if ( !hasPacket(id, supportsForge) )
{ {
@ -193,7 +193,7 @@ index c3c46399..aaee9df7 100644
Constructor<? extends DefinedPacket> constructor = protocolData.packetConstructors[id]; 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 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 ab949b4d..9091f6c1 100644 index d9a3c7e5..67f2976e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/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; @@ -6,6 +6,8 @@ import java.util.List;
@ -205,15 +205,15 @@ index ab949b4d..9091f6c1 100644
public static final int MINECRAFT_1_8 = 47; public static final int MINECRAFT_1_8 = 47;
public static final int MINECRAFT_1_9 = 107; public static final int MINECRAFT_1_9 = 107;
public static final int MINECRAFT_1_9_1 = 108; public static final int MINECRAFT_1_9_1 = 108;
@@ -20,6 +22,7 @@ public class ProtocolConstants @@ -21,6 +23,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_13 = 393;
public static final int MINECRAFT_1_13_1 = 401; public static final int MINECRAFT_1_13_1 = 401;
public static final int MINECRAFT_1_13_2 = 404;
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList( public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
+ "1.7.x", + "1.7.x",
"1.8.x", "1.8.x",
"1.9.x", "1.9.x",
"1.10.x", "1.10.x",
@@ -28,6 +31,8 @@ public class ProtocolConstants @@ -29,6 +32,8 @@ public class ProtocolConstants
"1.13.x" "1.13.x"
); );
public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList( public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
@ -1381,7 +1381,7 @@ index e1be7cce..7a20078b 100644
con.getServer().disconnect( "Quitting" ); 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 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 2843b94e..31ce6712 100644 index 7c19c6fb..2bb6fbcc 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/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 @@ -29,6 +29,10 @@ public abstract class EntityMap