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

Merge upstream

Browse Source
This commit is contained in:
Shane Freeder 2018-07-20 21:39:35 +01:00
parent 2bf2eb0c19
commit 5963c4a153
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
4 changed files with 15 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Waterfall

@ -1 +1 @@
Subproject commit 578418c4f2f6b80c4daec69e2deb5edceb19d610
Subproject commit 1d3fae9d1dacd7e271a8417f7765cea8d2e004d5

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

@ -1,14 +1,14 @@
From 179427338a7ff368e78dc222ae9769533be34329 Mon Sep 17 00:00:00 2001
From 30402ae45a5034a5b6f1b4cfccc28fd3da1f139f 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 bba6cb2d..673da608 100644
index c59e11cf..9c367d3a 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 bba6cb2d..673da608 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_R
);
+ public static final boolean isBeforeOrEq(int before, int other)

18
Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
View File

@ -1,4 +1,4 @@
From 33be1b5b17833e2a218557cb5d1916df6f5ee357 Mon Sep 17 00:00:00 2001
From 0ce3965eb3bdef827e33d840929d92e219434a0f 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,10 +167,10 @@ 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 a8ac332a..6fd624ae 100644
index c08398b1..e28788e5 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
@@ -384,6 +384,8 @@ public enum Protocol
@@ -392,6 +392,8 @@ public enum Protocol
private final TIntObjectMap<List<Integer>> linkedProtocols = new TIntObjectHashMap<>();
{
linkedProtocols.put( ProtocolConstants.MINECRAFT_1_8, Arrays.asList(
@ -179,7 +179,7 @@ index a8ac332a..6fd624ae 100644
ProtocolConstants.MINECRAFT_1_9,
ProtocolConstants.MINECRAFT_1_12,
ProtocolConstants.MINECRAFT_1_13
@@ -437,7 +439,11 @@ public enum Protocol
@@ -450,7 +452,11 @@ public enum Protocol
}
if ( !hasPacket(id, supportsForge) )
{
@ -574,7 +574,7 @@ index 00000000..2aa68858
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
index 673da608..80438990 100644
index 9c367d3a..292fece6 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -6,6 +6,8 @@ import java.util.List;
@ -586,15 +586,15 @@ index 673da608..80438990 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 = 389;
public static final int MINECRAFT_1_13_R = 393;
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
+ "1.7.x",
"1.8.x",
"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(
@ -1808,7 +1808,7 @@ index 719ad409..a5c798f4 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 bad9773b..45716724 100644
index 66a9d336..f5c9e2f1 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

119
Waterfall-Proxy-Patches/0006-Add-temp-1.13-release-support.patch
View File

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