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

Updated Upstream and Fix switching servers with disable metadata rewrite (#523)

Browse Source
This commit is contained in:
PatoTheBest 2020-06-27 22:39:33 -05:00 committed by GitHub
parent 7ec32c4226
commit d2dc905447
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 106 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 87cb3b90eadfadc7670e4c9a33fcb3f63a885947
Subproject commit 26f538d193e107f9e52a38fd05c3190c5852a05c

112
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From 3279685ad5222689075e15a104b7109ae96d1a96 Mon Sep 17 00:00:00 2001
From 456f67c5ecc169999f42df9ae1aa2e50e12b486d Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes
@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
- Deploy to papermc mvn repo
diff --git a/api/pom.xml b/api/pom.xml
index 9f41b24e..989365aa 100644
index ba38814a..3a105ce5 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -18,7 +18,7 @@ index 9f41b24e..989365aa 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -26,7 +26,7 @@ index 9f41b24e..989365aa 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -67,7 +67,7 @@ index 9f41b24e..989365aa 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 4f282347..65d4ea6b 100644
index deca32d9..15a829b6 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -78,7 +78,7 @@ index 4f282347..65d4ea6b 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -86,7 +86,7 @@ index 4f282347..65d4ea6b 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -145,7 +145,7 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index 6a648ac3..bc8eab68 100644
index 4fea24f6..3055357b 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,19 +4,20 @@
@ -157,7 +157,7 @@ index 6a648ac3..bc8eab68 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -165,7 +165,7 @@ index 6a648ac3..bc8eab68 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -176,7 +176,7 @@ index 6a648ac3..bc8eab68 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index de72662b..c12f6f81 100644
index e5ef0aa1..cec0e98a 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -187,7 +187,7 @@ index de72662b..c12f6f81 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -195,7 +195,7 @@ index de72662b..c12f6f81 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -206,7 +206,7 @@ index de72662b..c12f6f81 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 604def0a..9537382c 100644
index 1ec59451..5c634272 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -217,7 +217,7 @@ index 604def0a..9537382c 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -225,7 +225,7 @@ index 604def0a..9537382c 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -234,7 +234,7 @@ index 604def0a..9537382c 100644
+ <description>Generic java event dispatching API intended for use with Waterfall.</description>
</project>
diff --git a/log/pom.xml b/log/pom.xml
index 82487507..063232fb 100644
index 9a08ac9a..ccba264a 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -245,7 +245,7 @@ index 82487507..063232fb 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -253,7 +253,7 @@ index 82487507..063232fb 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -275,7 +275,7 @@ index 82487507..063232fb 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 78f1ce41..1ae342d3 100644
index 31aa325e..8fb7bb6f 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -286,7 +286,7 @@ index 78f1ce41..1ae342d3 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -294,11 +294,11 @@ index 78f1ce41..1ae342d3 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 2fef2fa5..8c594f47 100644
index 8f813716..a247e1a7 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -309,7 +309,7 @@ index 2fef2fa5..8c594f47 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -317,11 +317,11 @@ index 2fef2fa5..8c594f47 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 24aee73e..52c500da 100644
index a68925b8..eac49ae2 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -332,7 +332,7 @@ index 24aee73e..52c500da 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -340,11 +340,11 @@ index 24aee73e..52c500da 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 1d08b6ff..a8da255b 100644
index 116cdc69..56cd2e2f 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -355,7 +355,7 @@ index 1d08b6ff..a8da255b 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -363,11 +363,11 @@ index 1d08b6ff..a8da255b 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index 22bec872..04122421 100644
index a454cf16..d5d0c387 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -378,7 +378,7 @@ index 22bec872..04122421 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -386,11 +386,11 @@ index 22bec872..04122421 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index 1bf6e5f8..59b62472 100644
index 69296b14..39c5f9a7 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -401,7 +401,7 @@ index 1bf6e5f8..59b62472 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -409,7 +409,7 @@ index 1bf6e5f8..59b62472 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -439,7 +439,7 @@ index 1bf6e5f8..59b62472 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index e373f98e..64530b81 100644
index 976fccc2..415674cc 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@ -450,7 +450,7 @@ index e373f98e..64530b81 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -458,11 +458,11 @@ index e373f98e..64530b81 100644
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index dee2199f..c5c1f9e3 100644
index 36afa264..c69672f9 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -473,7 +473,7 @@ index dee2199f..c5c1f9e3 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -481,7 +481,7 @@ index dee2199f..c5c1f9e3 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -492,7 +492,7 @@ index dee2199f..c5c1f9e3 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4adbcf9a..8a2c105b 100644
index fb0133c4..ada53ad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -510,7 +510,7 @@ index 4adbcf9a..8a2c105b 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -616,7 +616,7 @@ index 4adbcf9a..8a2c105b 100644
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -240,5 +270,88 @@
@@ -260,5 +290,88 @@
</plugins>
</build>
</profile>
@ -706,7 +706,7 @@ index 4adbcf9a..8a2c105b 100644
</profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 65e61f99..04196782 100644
index 533ddbed..e58a361e 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -717,7 +717,7 @@ index 65e61f99..04196782 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -725,7 +725,7 @@ index 65e61f99..04196782 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -747,7 +747,7 @@ index 65e61f99..04196782 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index d536be02..7ff2f551 100644
index ca83e9d0..8a7daedd 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -758,7 +758,7 @@ index d536be02..7ff2f551 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -766,7 +766,7 @@ index d536be02..7ff2f551 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -818,7 +818,7 @@ index d536be02..7ff2f551 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index ad01212b..352eb37a 100644
index a3f8b47c..15cc4166 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -829,7 +829,7 @@ index ad01212b..352eb37a 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -837,7 +837,7 @@ index ad01212b..352eb37a 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.16-R0.1-SNAPSHOT</version>
<version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -859,5 +859,5 @@ index ad01212b..352eb37a 100644
<scope>compile</scope>
</dependency>
--
2.27.0
2.20.1.windows.1

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

@ -1,15 +1,15 @@
From 252f0e5b68aa460e00f646a57ee66040b8ac2381 Mon Sep 17 00:00:00 2001
From e99a057219d07d3c790e9b2664baff972400473a 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 3248d18a..7da62425 100644
index 7298b86c..a82f2ec8 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
@@ -66,6 +66,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_16
@@ -68,6 +68,16 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_16_1
);
+ public static final boolean isBeforeOrEq(int before, int other)
@ -26,5 +26,5 @@ index 3248d18a..7da62425 100644
{
--
2.27.0
2.20.1.windows.1

22
BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch
View File

@ -1,4 +1,4 @@
From 8502da833e5c18ffc55097e541f04289a00597fb Mon Sep 17 00:00:00 2001
From d096c1c4ceb4f6d8bfb292a9c416aad351dc457b Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -43,18 +43,18 @@ index c01cf317..17e12655 100644
* Allow this packet to be sent as an "extended" packet.
*/
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 65d4b0b1..6ed2bf92 100644
index b4dd2049..6ba7e3f7 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -219,7 +219,7 @@ public class ServerConnector extends PacketHandler
@@ -237,7 +237,7 @@ public class ServerConnector extends PacketHandler
{
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
- user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler.isServerForge() ) );
+ user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", brand, handshakeHandler.isServerForge() ) );
brand.release();
}
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
- user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler.isServerForge() ) );
+ user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", brand, handshakeHandler.isServerForge() ) );
brand.release();
user.setDimension( login.getDimension() );
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 147110e4..a2f62648 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@ -86,5 +86,5 @@ index afc2c12a..c0f7980b 100644
{
@Override
--
2.25.0
2.20.1.windows.1

10
BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From 039537507c3f69d0df0093fc0ebedeb91e70ac0d Mon Sep 17 00:00:00 2001
From de6f03073252328849c1525aabcccf334dd897ae Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers
@ -66,7 +66,7 @@ index 3e1776f7..fa34de48 100644
throw new BadPacketException( "Packet with id " + id + " outside of range " );
}
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 28e0d5f3..3abf2047 100644
index 1bf5e34c..7ef80bf5 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -32,7 +32,9 @@ import net.md_5.bungee.forge.ForgeUtils;
@ -105,10 +105,10 @@ index 53b12482..001ee1c2 100644
@Getter
@NonNull
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 76fcce9f..8a16fa93 100644
index 2622b738..3c4ecf0e 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
@@ -317,6 +317,12 @@ public abstract class EntityMap
@@ -318,6 +318,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index 76fcce9f..8a16fa93 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.27.0
2.20.1.windows.1

8
BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 5dc69c33d870ce55393fca54827d9a5ffb614c7c Mon Sep 17 00:00:00 2001
From 9cb2273187f1a4817c370897f150ff99ff3fab50 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Improve server list ping logging
@ -7,10 +7,10 @@ This functionality of this patch was adopted upstream, however, this
patch remains for a few misc improvements around here
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 3abf2047..fa3094b0 100644
index 7ef80bf5..97b7f236 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -433,6 +433,6 @@ public class ServerConnector extends PacketHandler
@@ -442,6 +442,6 @@ public class ServerConnector extends PacketHandler
@Override
public String toString()
{
@ -69,5 +69,5 @@ index 31777d93..cc141a11 100644
}
}
--
2.27.0
2.20.1.windows.1

8
BungeeCord-Patches/0027-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From 806cb9fb4f30b81602e2174c59392dde0628f8b8 Mon Sep 17 00:00:00 2001
From c370f55c114150f6218f0066a993c0b3cf076645 Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent
@ -62,10 +62,10 @@ index 0e1ef5c4..ee63732d 100644
@Deprecated
public String getKickReason()
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 fa3094b0..f5e7ef7b 100644
index 97b7f236..6ec13579 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -356,7 +356,7 @@ public class ServerConnector extends PacketHandler
@@ -365,7 +365,7 @@ public class ServerConnector extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = user.updateAndGetNextServer( target );
@ -146,5 +146,5 @@ index 6598781b..d1654bcc 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.27.0
2.20.1.windows.1

47
BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From a1bed894651e0c892edf0e590bd9ba70f09ce8dd Mon Sep 17 00:00:00 2001
From 9da4de19fb4ab9a7e82b613f9b97287aa703d41b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -57,7 +57,7 @@ index 4ff8da6d..e860214f 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 f5e7ef7b..bb4e7ec2 100644
index 6ec13579..78401dae 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -228,7 +228,7 @@ public class ServerConnector extends PacketHandler
@ -69,7 +69,7 @@ index f5e7ef7b..bb4e7ec2 100644
{
ch.write( user.getSettings() );
}
@@ -262,6 +262,7 @@ public class ServerConnector extends PacketHandler
@@ -281,6 +281,7 @@ public class ServerConnector extends PacketHandler
user.getTabListHandler().onServerChange();
Scoreboard serverScoreboard = user.getServerSentScoreboard();
@ -77,7 +77,7 @@ index f5e7ef7b..bb4e7ec2 100644
for ( Objective objective : serverScoreboard.getObjectives() )
{
user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) );
@@ -274,6 +275,7 @@ public class ServerConnector extends PacketHandler
@@ -293,6 +294,7 @@ public class ServerConnector extends PacketHandler
{
user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) );
}
@ -85,16 +85,14 @@ index f5e7ef7b..bb4e7ec2 100644
serverScoreboard.clear();
for ( UUID bossbar : user.getSentBossBars() )
@@ -292,7 +294,7 @@ public class ServerConnector extends PacketHandler
@@ -311,12 +313,35 @@ public class ServerConnector extends PacketHandler
}
user.setDimensionChange( true );
- if ( login.getDimension().equals( user.getDimension() ) )
+ if ( !user.isDisableEntityMetadataRewrite() && login.getDimension().equals( user.getDimension() ) ) // Waterfall - defer
- if ( login.getDimension() == user.getDimension() )
+ if ( !user.isDisableEntityMetadataRewrite() && login.getDimension() == user.getDimension() ) // Waterfall - defer
{
Object newDim;
String worldName = login.getWorldName();
@@ -308,6 +310,44 @@ public class ServerConnector extends PacketHandler
user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
}
user.setServerEntityId( login.getEntityId() );
@ -105,34 +103,19 @@ index f5e7ef7b..bb4e7ec2 100644
+ user.setClientEntityId( login.getEntityId() );
+
+ // Only send if we are not in the same dimension
+ if (!login.getDimension().equals( user.getDimension() ) ) // Waterfall - defer
+ if ( login.getDimension() != user.getDimension() ) // Waterfall - defer
+ {
+ Object newDim;
+ String worldName = login.getWorldName();
+ if (login.getDimension() instanceof Number) {
+ newDim = (((Number) login.getDimension()).intValue() >= 0 ? -1 : 0);
+ } else {
+ newDim = worldName = ("minecraft:overworld".equals(login.getDimension())) ? "minecraft:the_nether" : "minecraft:overworld";
+ }
+ user.unsafe().sendPacket( new Respawn( newDim, worldName, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+ user.unsafe().sendPacket( new Respawn( (Integer) user.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+ }
+
+
+ Login modLogin = new Login( login.getEntityId(), login.getGameMode(), login.getPreviousGameMode(), login.getWorldNames(), login.getDimensions(), login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(),
+ (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat() );
+ user.unsafe().sendPacket(modLogin);
+
+ // Only send if we're in the same dimension
+ if (login.getDimension().equals( user.getDimension() ) ) // Waterfall - defer
+ if ( login.getDimension() == user.getDimension() ) // Waterfall - defer
+ {
+ Object newDim;
+ String worldName = login.getWorldName();
+ if (login.getDimension() instanceof Number) {
+ newDim = (((Number) login.getDimension()).intValue() >= 0 ? -1 : 0);
+ } else {
+ newDim = worldName = ("minecraft:overworld".equals(login.getDimension())) ? "minecraft:the_nether" : "minecraft:overworld";
+ }
+ user.unsafe().sendPacket( new Respawn( newDim, worldName, login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+ user.unsafe().sendPacket( new Respawn( (Integer) login.getDimension() >= 0 ? -1 : 0, login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(), false ) );
+ }
+ }
+ // Waterfall end
@ -175,7 +158,7 @@ index cfd25859..f845da09 100644
}
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 8a16fa93..ef2a66fa 100644
index 3c4ecf0e..e64a11b5 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
@@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufInputStream;
@ -198,7 +181,7 @@ index 8a16fa93..ef2a66fa 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -279,7 +285,13 @@ public abstract class EntityMap
@@ -280,7 +286,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -251,5 +234,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.27.0
2.20.1.windows.1

10
BungeeCord-Patches/0056-Remove-version-from-brand-info.patch
View File

@ -1,11 +1,11 @@
From 8b4c91510a061f133ce20defed7ca62869e3cd16 Mon Sep 17 00:00:00 2001
From 3d60acb1ffe29a463df7b6a831bbf3022159ecc7 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 20 Jun 2020 18:21:17 +0100
Subject: [PATCH] Remove version from brand info
diff --git a/log4j/pom.xml b/log4j/pom.xml
index f5267567..e9d935ef 100644
index f5267567..2229d347 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -5,13 +5,13 @@
@ -13,14 +13,14 @@ index f5267567..e9d935ef 100644
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-parent</artifactId>
- <version>1.15-SNAPSHOT</version>
+ <version>1.16-R0.1-SNAPSHOT</version>
+ <version>1.16-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-log4j</artifactId>
- <version>1.15-SNAPSHOT</version>
+ <version>1.16-R0.1-SNAPSHOT</version>
+ <version>1.16-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Waterfall-Log</name>
@ -38,5 +38,5 @@ index d7d0fafc..daac8604 100644
brand.release();
// changes in the packet are ignored so we need to send it manually
--
2.27.0
2.20.1.windows.1

43
BungeeCord-Patches/0057-Temp-1.16.1-proto-support.patch
View File

@ -1,43 +0,0 @@
From 420a4a6d2cfe289d2d176d905355c821652db8b8 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 24 Jun 2020 18:25:43 +0100
Subject: [PATCH] Temp 1.16.1 proto support
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 7da62425..e11076fd 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
@@ -29,6 +29,7 @@ public class ProtocolConstants
public static final int MINECRAFT_1_15_1 = 575;
public static final int MINECRAFT_1_15_2 = 578;
public static final int MINECRAFT_1_16 = 735;
+ public static final int MINECRAFT_1_16_1 = 736; // Waterfall
public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
"1.8.x",
"1.9.x",
@@ -63,7 +64,8 @@ public class ProtocolConstants
ProtocolConstants.MINECRAFT_1_15,
ProtocolConstants.MINECRAFT_1_15_1,
ProtocolConstants.MINECRAFT_1_15_2,
- ProtocolConstants.MINECRAFT_1_16
+ ProtocolConstants.MINECRAFT_1_16, // Waterfall
+ ProtocolConstants.MINECRAFT_1_16_1 // Waterfall
);
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 ef2a66fa..0e6395ba 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
@@ -68,6 +68,7 @@ public abstract class EntityMap
case ProtocolConstants.MINECRAFT_1_15_2:
return EntityMap_1_15.INSTANCE;
case ProtocolConstants.MINECRAFT_1_16:
+ case ProtocolConstants.MINECRAFT_1_16_1: // Waterfall
return EntityMap_1_16.INSTANCE;
}
throw new RuntimeException( "Version " + version + " has no entity map" );
--
2.27.0