Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord) 

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

BungeeCord Changes:
23661737 Minecraft 1.16.3 support
5ab5a846 #2953: Fix player limit off by one
This commit is contained in:
Shane Freeder 2020-09-11 00:45:58 +01:00
parent 61700eb820
commit 5aa8f709bb
3 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit e93c762f164b45af15b577a1372044958b97cbef
Subproject commit 23661737efcfa3d79b5fd28c163e31e8af88003d

10
BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
View File

@ -1,15 +1,15 @@
From b6077cf1f2ceecea52865c8fb340e2e56cbba387 Mon Sep 17 00:00:00 2001
From 0c66158378f219a83d0a50443126c910c88b6fb3 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 4ffc35e4..aa1b770c 100644
index da207d5f..f33bb5c4 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
@@ -70,6 +70,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_16_2
@@ -72,6 +72,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_16_3
);
+ public static final boolean isBeforeOrEq(int before, int other)
@ -26,5 +26,5 @@ index 4ffc35e4..aa1b770c 100644
{
--
2.24.0
2.28.0

31
BungeeCord-Patches/0058-Waterfall-1.16.3-Patch.patch
View File

@ -1,31 +0,0 @@
From d3bf43998d56d5050eb34fded366e0fdb3ae4f4e Mon Sep 17 00:00:00 2001
From: "Five (Xer)" <admin@xernium.com>
Date: Thu, 10 Sep 2020 17:42:01 +0200
Subject: [PATCH] Waterfall-1.16.3-Patch
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 aa1b770c..f33bb5c4 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
@@ -31,6 +31,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_16 = 735;
public static final int MINECRAFT_1_16_1 = 736;
public static final int MINECRAFT_1_16_2 = 751;
+ public static final int MINECRAFT_1_16_3 = 753;
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
"1.8.x",
"1.9.x",
@@ -67,7 +68,8 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_15_2,
ProtocolConstants.MINECRAFT_1_16,
ProtocolConstants.MINECRAFT_1_16_1,
- ProtocolConstants.MINECRAFT_1_16_2
+ ProtocolConstants.MINECRAFT_1_16_2,
+ ProtocolConstants.MINECRAFT_1_16_3
);
public static final boolean isBeforeOrEq(int before, int other)
--
2.24.0