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

Initial work on bringing up to 1.20.2

Browse Source
This commit is contained in:
Shane Freeder 2023-09-21 11:33:23 +01:00
parent 3102433f31
commit 7800e6fb9f
65 changed files with 546 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 68200133b6aa06d9fd257e47c11cfe734ec001bf
Subproject commit d9bbdc3281ab6f9a3f6383febc75f0279d8d7c02

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

@ -1,4 +1,4 @@
From 5c99ae2417d30f8021126598b8694876f9e1c3c3 Mon Sep 17 00:00:00 2001
From d002f1654018a69fdee68237fff9aa1442363bc2 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 67e0673d..83ae2220 100644
index 30739518..bdccbd78 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -16,9 +16,10 @@ index 67e0673d..83ae2220 100644
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
- <version>1.20-R0.2-SNAPSHOT</version>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
+ <version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -26,7 +27,7 @@ index 67e0673d..83ae2220 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -67,7 +68,7 @@ index 67e0673d..83ae2220 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 59b07868..e5797d70 100644
index b10e7a38..07d49112 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -78,7 +79,7 @@ index 59b07868..e5797d70 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -86,7 +87,7 @@ index 59b07868..e5797d70 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -145,7 +146,7 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index c9b91050..040aa0f7 100644
index 87c2beb1..2aa2ad55 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,19 +4,19 @@
@ -156,7 +157,7 @@ index c9b91050..040aa0f7 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -164,7 +165,7 @@ index c9b91050..040aa0f7 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -175,7 +176,7 @@ index c9b91050..040aa0f7 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 799ce536..7e2d07a7 100644
index 06d2e13b..058e6fa8 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -186,7 +187,7 @@ index 799ce536..7e2d07a7 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -194,7 +195,7 @@ index 799ce536..7e2d07a7 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -205,7 +206,7 @@ index 799ce536..7e2d07a7 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 30842b97..b2541c62 100644
index 13e71066..316f1e35 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -216,7 +217,7 @@ index 30842b97..b2541c62 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -224,7 +225,7 @@ index 30842b97..b2541c62 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -233,7 +234,7 @@ index 30842b97..b2541c62 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 fd0bee2c..8368f7b3 100644
index 47eb961c..9ee30d66 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -244,7 +245,7 @@ index fd0bee2c..8368f7b3 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -252,7 +253,7 @@ index fd0bee2c..8368f7b3 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -274,7 +275,7 @@ index fd0bee2c..8368f7b3 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index f9d39d6f..47d83c68 100644
index e63a1dfb..2016f6a1 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -285,7 +286,7 @@ index f9d39d6f..47d83c68 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -293,11 +294,11 @@ index f9d39d6f..47d83c68 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 4eb9508f..6db051a8 100644
index 60b69834..7371de6a 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -308,7 +309,7 @@ index 4eb9508f..6db051a8 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -316,11 +317,11 @@ index 4eb9508f..6db051a8 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml
index 3f735c39..e23f59d2 100644
index 822babc6..9fac0511 100644
--- a/module/cmd-kick/pom.xml
+++ b/module/cmd-kick/pom.xml
@@ -4,14 +4,14 @@
@ -331,7 +332,7 @@ index 3f735c39..e23f59d2 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -339,11 +340,11 @@ index 3f735c39..e23f59d2 100644
- <artifactId>bungeecord-module-cmd-kick</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-kick</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 6b503c52..88ebf0f7 100644
index ba861252..d7324d89 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -354,7 +355,7 @@ index 6b503c52..88ebf0f7 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -362,11 +363,11 @@ index 6b503c52..88ebf0f7 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 07cef355..5887d1e9 100644
index 1a62e71d..00539f37 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -377,7 +378,7 @@ index 07cef355..5887d1e9 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -385,11 +386,11 @@ index 07cef355..5887d1e9 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index 03165b52..91a09d8b 100644
index 57cbf1e9..6785f2a0 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -400,7 +401,7 @@ index 03165b52..91a09d8b 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -408,11 +409,11 @@ index 03165b52..91a09d8b 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index 0b495660..89c34e80 100644
index b1fd5afd..d78c9a25 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -423,7 +424,7 @@ index 0b495660..89c34e80 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -431,7 +432,7 @@ index 0b495660..89c34e80 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -461,10 +462,10 @@ index 0b495660..89c34e80 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index 718f47a7..3ba983d9 100644
index cf663eec..a426476d 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,8 +4,8 @@
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
@ -472,11 +473,19 @@ index 718f47a7..3ba983d9 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index effa68e6..2412768b 100644
index a4265e54..5e9d29d7 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -487,7 +496,7 @@ index effa68e6..2412768b 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -495,7 +504,7 @@ index effa68e6..2412768b 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -506,7 +515,7 @@ index effa68e6..2412768b 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index acdf957a..1bf8b510 100644
index ed3c1a87..a6684b7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -524,7 +533,7 @@ index acdf957a..1bf8b510 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -603,7 +612,7 @@ index acdf957a..1bf8b510 100644
</distributionManagement>
<properties>
@@ -134,12 +149,21 @@
@@ -143,12 +158,21 @@
</execution>
</executions>
</plugin>
@ -625,7 +634,7 @@ index acdf957a..1bf8b510 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.0</version>
@@ -164,6 +188,7 @@
@@ -173,6 +197,7 @@
</dependency>
</dependencies>
</plugin>
@ -633,7 +642,7 @@ index acdf957a..1bf8b510 100644
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -276,6 +301,15 @@
@@ -285,6 +310,15 @@
</goals>
</execution>
</executions>
@ -649,7 +658,7 @@ index acdf957a..1bf8b510 100644
</plugin>
<plugin>
<groupId>org.projectlombok</groupId>
@@ -325,6 +359,7 @@
@@ -333,6 +367,7 @@
<!-- lombok does not add @return or @param which causes warnings, so ignore -->
<doclint>none</doclint>
<sourcepath>${project.build.directory}/delombok</sourcepath>
@ -658,7 +667,7 @@ index acdf957a..1bf8b510 100644
</execution>
</executions>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index d8ce7f6c..c6105b87 100644
index f1c169a9..12096614 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -669,7 +678,7 @@ index d8ce7f6c..c6105b87 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -677,7 +686,7 @@ index d8ce7f6c..c6105b87 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -699,7 +708,7 @@ index d8ce7f6c..c6105b87 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index a783a605..39bff865 100644
index 335ee3d5..5558adfb 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -710,7 +719,7 @@ index a783a605..39bff865 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -718,7 +727,7 @@ index a783a605..39bff865 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -726,7 +735,7 @@ index a783a605..39bff865 100644
<description>Proxy component of the Elastic Portal Suite</description>
<properties>
@@ -52,32 +52,32 @@
@@ -52,38 +52,38 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -769,8 +778,16 @@ index a783a605..39bff865 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-slf4j</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-slf4j</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index 7688b844..fc864f83 100644
index edd3e11a..4e9bd6cc 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -781,7 +798,7 @@ index 7688b844..fc864f83 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -789,7 +806,7 @@ index 7688b844..fc864f83 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -810,6 +827,35 @@ index 7688b844..fc864f83 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
--
2.41.0
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
index acb5201f..b7529bf3 100644
--- a/slf4j/pom.xml
+++ b/slf4j/pom.xml
@@ -4,18 +4,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
- <version>1.20-R0.2-SNAPSHOT</version>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-super</artifactId>
+ <version>dev-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-slf4j</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-slf4j</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-SLF4J</name>
+ <name>Waterfall-SLF4J</name>
<description>Wrapper over SLF4J for BungeeCord purposes.</description>
<properties>
--
2.42.0

8
BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
View File

@ -1,14 +1,14 @@
From 93d49833d2e9eecf92515baee0605f412352f57e Mon Sep 17 00:00:00 2001
From adedd18803ccda77f946628374b537f459b16010 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 8b27abff..18574b30 100644
index 46311941..3800141e 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
@@ -112,6 +112,16 @@ public class ProtocolConstants
@@ -113,6 +113,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}
@ -26,5 +26,5 @@ index 8b27abff..18574b30 100644
{
--
2.41.0.windows.1
2.42.0

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

@ -1,4 +1,4 @@
From 55c22f21707d2e9e81d2691c12f3a990b0c28c3d Mon Sep 17 00:00:00 2001
From 26fe18efeeb9121455d23354b9f1869096a6ac6e 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,23 +43,23 @@ index 70b292f0..91f71c09 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 3f01fb24..0afa455f 100644
index 7ef4ee91..287a0545 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -251,7 +251,7 @@ public class ServerConnector extends PacketHandler
{
@@ -266,7 +266,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() ) );
- user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler != null && handshakeHandler.isServerForge() ) );
+ user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", brand, handshakeHandler != null && handshakeHandler.isServerForge() ) ); // Waterfall
brand.release();
}
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 05cdf684..cc0edeb8 100644
index 117ebb76..b8248ec4 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -293,7 +293,7 @@ public class DownstreamBridge extends PacketHandler
@@ -300,7 +300,7 @@ public class DownstreamBridge extends PacketHandler
brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@ -82,5 +82,5 @@ index 5b9c35d1..2d6885a9 100644
{
@Override
--
2.41.0.windows.1
2.42.0

10
BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
View File

@ -1,4 +1,4 @@
From 09154e5194baacc038eba0543acb428c599d33d5 Mon Sep 17 00:00:00 2001
From c9671bec552214bb7a11f23b331be48f9486287d Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions
@ -207,7 +207,7 @@ index 00000000..cc24dd35
+}
\ No newline at end of file
diff --git a/api/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java
index 1457d4c8..70bf87f7 100644
index 6352951c..91efc0a6 100644
--- a/api/src/main/java/net/md_5/bungee/Util.java
+++ b/api/src/main/java/net/md_5/bungee/Util.java
@@ -3,6 +3,7 @@ package net.md_5.bungee;
@ -250,10 +250,10 @@ index 88d36ad2..fc92a7b5 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index d2f90b93..0e08e71d 100644
index e542c1be..107ff484 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -713,7 +713,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -735,7 +735,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
@ -263,5 +263,5 @@ index d2f90b93..0e08e71d 100644
@Override
--
2.38.1
2.42.0

12
BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
View File

@ -1,4 +1,4 @@
From 51fe7e01d834ef8c6f41f6cd3ebb2adec745ffe4 Mon Sep 17 00:00:00 2001
From 552edd40b9f52f222c23c278103f6dae84f3cf40 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled
@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
No breaking changes occur due to this patch.
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 28205be3..b71a2c35 100644
index 287a0545..7c3e9a29 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufAllocator;
@ -23,7 +23,7 @@ index 28205be3..b71a2c35 100644
import java.util.Queue;
import java.util.Set;
import java.util.UUID;
@@ -108,15 +109,39 @@ public class ServerConnector extends PacketHandler
@@ -110,15 +111,39 @@ public class ServerConnector extends PacketHandler
String newHost = copiedHandshake.getHost() + "\00" + AddressUtil.sanitizeAddress( user.getAddress() ) + "\00" + user.getUUID();
LoginResult profile = user.getPendingConnection().getLoginProfile();
@ -67,10 +67,10 @@ index 28205be3..b71a2c35 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index e1b084ea..f0fb7694 100644
index 9d2df335..65e942cd 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -164,8 +164,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -168,8 +168,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this );
@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
* The FML 1.8 handshake token.
*/
--
2.35.3
2.42.0

10
BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
View File

@ -1,15 +1,15 @@
From 1ea8b846f0c0dab4d0a9d526e8bf7052fc3b8bdc Mon Sep 17 00:00:00 2001
From 070fbdb76af6565d8529655d4648e0efca42106e Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API
diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
index 20c62f1d..e8d65a54 100644
index 95dd1620..98eb30ab 100644
--- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
@@ -450,6 +450,26 @@ public class ComponentsTest
Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
@@ -666,6 +666,26 @@ public class ComponentsTest
Assert.assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
}
+ @Test
@ -53,5 +53,5 @@ index 9e37eed0..a25a01b8 100644
+ }
}
--
2.30.1 (Apple Git-130)
2.42.0

10
BungeeCord-Patches/0015-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From feede4c38be31f029da9c86306795c9b94ae1e69 Mon Sep 17 00:00:00 2001
From 899f2a62a91d604866e2a5a85378b2fe9bc30aa0 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations
@ -8,10 +8,10 @@ Subject: [PATCH] Micro-optimizations
- Don't create a data input stream for every plugin message we get from servers
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 1059c67f..889e60c2 100644
index b8248ec4..23e7b6d8 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -275,7 +275,6 @@ public class DownstreamBridge extends PacketHandler
@@ -282,7 +282,6 @@ public class DownstreamBridge extends PacketHandler
@SuppressWarnings("checkstyle:avoidnestedblocks")
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -19,7 +19,7 @@ index 1059c67f..889e60c2 100644
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -302,6 +301,7 @@ public class DownstreamBridge extends PacketHandler
@@ -309,6 +308,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{
@ -28,5 +28,5 @@ index 1059c67f..889e60c2 100644
String subChannel = in.readUTF();
--
2.38.1
2.42.0

32
BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From 66fcaee1c689ff5f8b4f016a31f17c9d8650cb46 Mon Sep 17 00:00:00 2001
From 88fb3abe3ca17082bc542226a1f52df63517cf67 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
@ -9,10 +9,10 @@ Vanilla servers still error on negative/invalid packets.
Original issue: https://github.com/WaterfallMC/Waterfall-Old/issues/11
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index 773e954c..57bd22b7 100644
index 1bc50e8c..0244ec1a 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -16,6 +16,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -18,6 +18,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
private final boolean server;
@Setter
private int protocolVersion;
@ -27,7 +27,7 @@ index 773e954c..57bd22b7 100644
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
@@ -34,7 +42,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -36,7 +44,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
{
int packetId = DefinedPacket.readVarInt( in );
@ -37,10 +37,10 @@ index 773e954c..57bd22b7 100644
{
packet.read( in, prot.getDirection(), protocolVersion );
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 746defae..dabfa4db 100644
index 285e591e..5eb00df3 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
@@ -655,14 +655,23 @@ public enum Protocol
@@ -749,14 +749,23 @@ public enum Protocol
return protocol;
}
@ -66,7 +66,7 @@ index 746defae..dabfa4db 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 9bceb122..66f0d0a2 100644
index 7c3e9a29..56e500a1 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -34,7 +34,9 @@ import net.md_5.bungee.forge.ForgeUtils;
@ -79,9 +79,9 @@ index 9bceb122..66f0d0a2 100644
import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.ProtocolConstants;
@@ -208,6 +210,12 @@ public class ServerConnector extends PacketHandler
ServerConnection server = new ServerConnection( ch, target );
@@ -223,6 +225,12 @@ public class ServerConnector extends PacketHandler
public static void handleLogin(ProxyServer bungee, ChannelWrapper ch, UserConnection user, BungeeServerInfo target, ForgeServerHandler handshakeHandler, ServerConnection server, Login login) throws Exception
{
ServerConnectedEvent event = new ServerConnectedEvent( user, server );
+
+ if (server.isForgeServer() && user.isForgeUser()) {
@ -93,22 +93,22 @@ index 9bceb122..66f0d0a2 100644
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 09b9f342..4b530a8b 100644
index 65e942cd..e37d502b 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -73,6 +73,7 @@ public final class UserConnection implements ProxiedPlayer
@NonNull
@@ -74,6 +74,7 @@ public final class UserConnection implements ProxiedPlayer
private final ProxyServer bungee;
@Getter
@NonNull
+ @Getter
private final ChannelWrapper ch;
@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 5440f4b5..4dde5cff 100644
index 30cc36a4..c033118f 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
@@ -336,6 +336,12 @@ public abstract class EntityMap
@@ -338,6 +338,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index 5440f4b5..4dde5cff 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.41.0.windows.1
2.42.0

12
BungeeCord-Patches/0018-Add-basic-support-for-configurable-tab-complete-thro.patch → BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
View File

@ -1,4 +1,4 @@
From 3d566b44103875552570fe60c2810ee911736707 Mon Sep 17 00:00:00 2001
From 026666cd0b61145f531a89fc9791b0d6bb608b9e Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling
@ -73,10 +73,10 @@ index 741ebfde..91743f01 100644
+ }
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 37a17c21..e87cd53a 100644
index d288b6f2..c301b033 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -44,6 +44,8 @@ public class UpstreamBridge extends PacketHandler
@@ -47,6 +47,8 @@ public class UpstreamBridge extends PacketHandler
private final ProxyServer bungee;
private final UserConnection con;
@ -85,7 +85,7 @@ index 37a17c21..e87cd53a 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -211,6 +213,20 @@ public class UpstreamBridge extends PacketHandler
@@ -213,6 +215,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{
@ -105,7 +105,7 @@ index 37a17c21..e87cd53a 100644
+ // Waterfall end - tab limiter
List<String> suggestions = new ArrayList<>();
boolean isRegisteredCommand = false;
boolean isCommand = tabComplete.getCursor().startsWith( "/" );
--
2.38.1
2.42.0

47
BungeeCord-Patches/0017-Resolve-sendData-deadlocks.patch
View File

@ -1,47 +0,0 @@
From 1371c7a0ef5af1684661cee2af8c8fbe8c761b36 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Fri, 12 Feb 2016 23:55:53 -0500
Subject: [PATCH] Resolve sendData() deadlocks
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
index 4bb0f68f..9d581d9a 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
@@ -110,19 +110,22 @@ public class BungeeServerInfo implements ServerInfo
Preconditions.checkNotNull( channel, "channel" );
Preconditions.checkNotNull( data, "data" );
- synchronized ( packetQueue )
- {
- Server server = ( players.isEmpty() ) ? null : players.iterator().next().getServer();
- if ( server != null )
- {
- server.sendData( channel, data );
- return true;
- } else if ( queue )
- {
- packetQueue.add( new PluginMessage( channel, data, false ) );
+ Server server;
+
+ synchronized (players) {
+ server = players.isEmpty() ? null : players.iterator().next().getServer();
+ }
+
+ if (server != null) {
+ server.sendData(channel, data);
+ return true;
+ } else if (queue) {
+ synchronized (packetQueue) {
+ packetQueue.add(new PluginMessage(channel, data, false));
}
- return false;
}
+
+ return false;
}
private long lastPing;
--
2.30.1 (Apple Git-130)

20
BungeeCord-Patches/0019-Improve-server-list-ping-logging.patch → BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 023d412da1f2d78c1e8f60fbaf92abf5a91016ff Mon Sep 17 00:00:00 2001
From dd23fa1240254bbd39f7238ea37f873248f3c186 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 66f0d0a2..9f36f606 100644
index 56e500a1..0ef085ef 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -464,6 +464,6 @@ public class ServerConnector extends PacketHandler
@@ -500,6 +500,6 @@ public class ServerConnector extends PacketHandler
@Override
public String toString()
{
@ -19,10 +19,10 @@ index 66f0d0a2..9f36f606 100644
}
}
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 b3fe9a64..f84554dd 100644
index 23e7b6d8..88b0156c 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -708,6 +708,6 @@ public class DownstreamBridge extends PacketHandler
@@ -774,6 +774,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -31,10 +31,10 @@ index b3fe9a64..f84554dd 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index bd8a467d..b8450c28 100644
index 107ff484..68687242 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -719,20 +719,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -741,20 +741,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{
@ -57,10 +57,10 @@ index bd8a467d..b8450c28 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index e87cd53a..c30093d7 100644
index c301b033..2038b9a8 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -328,6 +328,6 @@ public class UpstreamBridge extends PacketHandler
@@ -353,6 +353,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -69,5 +69,5 @@ index e87cd53a..c30093d7 100644
}
}
--
2.41.0.windows.1
2.42.0

8
BungeeCord-Patches/0020-Add-a-property-to-accept-invalid-ping-packets.patch → BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch
View File

@ -1,4 +1,4 @@
From 23174941bfb0c6555ef478b0043823b1ba60594e Mon Sep 17 00:00:00 2001
From eda9cacd20244f3823b9a1fa99d760ab4a584bad Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 7 Feb 2016 00:01:19 -0700
Subject: [PATCH] Add a property to accept invalid ping packets
@ -9,10 +9,10 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
Fixes #23
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 562afbaa..fd03d152 100644
index 68687242..72dad6d3 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -300,10 +300,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -302,10 +302,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}
@ -29,5 +29,5 @@ index 562afbaa..fd03d152 100644
disconnect( "" );
}
--
2.37.1
2.42.0

10
BungeeCord-Patches/0021-Use-a-worker-and-a-boss-event-loop-group.patch → BungeeCord-Patches/0020-Use-a-worker-and-a-boss-event-loop-group.patch
View File

@ -1,4 +1,4 @@
From 40bdf52eae5d4d492216601188a4c54dbb00cc1c Mon Sep 17 00:00:00 2001
From 1e597d86bd5b0bb1fbd197fdc904097e6e96012f Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.
@ -8,7 +8,7 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
This is proper practice for netty.
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index c036b613..f7794f66 100644
index b09afd88..93a96bfd 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -120,7 +120,7 @@ public class BungeeCord extends ProxyServer
@ -70,10 +70,10 @@ index c036b613..f7794f66 100644
getLogger().info( "Thank you and goodbye" );
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
index 51b2a324..634dfca7 100644
index 671cf96f..377df7ec 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
@@ -184,7 +184,7 @@ public class BungeeServerInfo implements ServerInfo
@@ -185,7 +185,7 @@ public class BungeeServerInfo implements ServerInfo
};
new Bootstrap()
.channel( PipelineUtils.getChannel( socketAddress ) )
@ -83,5 +83,5 @@ index 51b2a324..634dfca7 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
.remoteAddress( socketAddress )
--
2.40.0
2.42.0

12
BungeeCord-Patches/0022-Better-Decompression-Sanity.patch → BungeeCord-Patches/0021-Better-Decompression-Sanity.patch
View File

@ -1,4 +1,4 @@
From 308ef44c07acd33e80920f2134af7472d0221f4b Mon Sep 17 00:00:00 2001
From a476bbb603de2235e9f1dde545878e2ecd69cd30 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Fri, 18 Mar 2016 10:53:24 -0700
Subject: [PATCH] Better Decompression Sanity
@ -45,18 +45,18 @@ index 445ee947..eaedf4bc 100644
out.add( decompressed );
decompressed = null;
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
index 6be2d942..6dc5633f 100644
index 915f8a7b..f3fe5061 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
@@ -138,7 +138,7 @@ public class ChannelWrapper
@@ -176,7 +176,7 @@ public class ChannelWrapper
if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold != -1 )
if ( ch.pipeline().get( PacketDecompressor.class ) == null && compressionThreshold >= 0 )
{
- addBefore( PipelineUtils.PACKET_DECODER, "decompress", new PacketDecompressor() );
+ addBefore( PipelineUtils.PACKET_DECODER, "decompress", new PacketDecompressor(compressionThreshold) );
}
if ( compressionThreshold == -1 )
if ( compressionThreshold < 0 )
{
--
2.30.1 (Apple Git-130)
2.42.0

10
BungeeCord-Patches/0023-Validate-that-chat-messages-are-non-blank.patch → BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch
View File

@ -1,14 +1,14 @@
From e497a697d54e977d9ee969852cd84011c70bf435 Mon Sep 17 00:00:00 2001
From faa0558a5ed64dd66b2aca04bc6fa870ad237df6 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 25 Oct 2016 12:34:41 -0400
Subject: [PATCH] Validate that chat messages are non-blank
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index c30093d7..7fb79bfd 100644
index 2038b9a8..7bcd317e 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -188,6 +188,7 @@ public class UpstreamBridge extends PacketHandler
@@ -190,6 +190,7 @@ public class UpstreamBridge extends PacketHandler
private String handleChat(String message)
{
@ -16,7 +16,7 @@ index c30093d7..7fb79bfd 100644
for ( int index = 0, length = message.length(); index < length; index++ )
{
char c = message.charAt( index );
@@ -195,8 +196,14 @@ public class UpstreamBridge extends PacketHandler
@@ -197,8 +198,14 @@ public class UpstreamBridge extends PacketHandler
{
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
throw CancelSendSignal.INSTANCE;
@ -32,5 +32,5 @@ index c30093d7..7fb79bfd 100644
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
--
2.40.0
2.42.0

4
BungeeCord-Patches/0024-Add-dynamic-server-addition-removal-api.patch → BungeeCord-Patches/0023-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From d1323d4e9c014a055817c840b85918e12b1d7add Mon Sep 17 00:00:00 2001
From 5db60dbe715d4f186caee02e5cbbba4df5b23d90 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -311,5 +311,5 @@ index ecd3b619..7094fe0b 100644
+ // Waterfall end
}
--
2.40.1.windows.1
2.42.0

4
BungeeCord-Patches/0025-Add-callEvent-shortcut-to-Event.patch → BungeeCord-Patches/0024-Add-callEvent-shortcut-to-Event.patch
View File

@ -1,4 +1,4 @@
From fac41e3a38b4f6285700c2527da3e9bbbdb5087e Mon Sep 17 00:00:00 2001
From 3dfc4797edcf7a603aa3e0c630cb5f8adacccbdf Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Sun, 14 Apr 2019 19:15:00 +0300
Subject: [PATCH] Add callEvent() shortcut to Event
@ -28,5 +28,5 @@ index e2e01ecb..25ec1bd8 100644
+ // Waterfall end
}
--
2.30.1 (Apple Git-130)
2.42.0

16
BungeeCord-Patches/0026-Improve-ServerKickEvent.patch → BungeeCord-Patches/0025-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From 19b68d7b84a52a3bb92adb369b609298b37d352a Mon Sep 17 00:00:00 2001
From 4b8555541651cd8725da0ee0ece99f70b41ff82a 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 9f36f606..6473a10c 100644
index 0ef085ef..2624dd37 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -381,7 +381,7 @@ public class ServerConnector extends PacketHandler
@@ -417,7 +417,7 @@ public class ServerConnector extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = user.updateAndGetNextServer( target );
@ -75,10 +75,10 @@ index 9f36f606..6473a10c 100644
{
// Pre cancel the event if we are going to try another server
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 f84554dd..e8ef17a1 100644
index 88b0156c..30fbb0b1 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -90,16 +90,19 @@ public class DownstreamBridge extends PacketHandler
@@ -97,16 +97,19 @@ public class DownstreamBridge extends PacketHandler
return;
}
@ -103,7 +103,7 @@ index f84554dd..e8ef17a1 100644
}
@Override
@@ -114,7 +117,19 @@ public class DownstreamBridge extends PacketHandler
@@ -121,7 +124,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() )
{
@ -124,7 +124,7 @@ index f84554dd..e8ef17a1 100644
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -582,7 +597,11 @@ public class DownstreamBridge extends PacketHandler
@@ -620,7 +635,11 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@ -138,5 +138,5 @@ index f84554dd..e8ef17a1 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.41.0.windows.1
2.42.0

4
BungeeCord-Patches/0027-Configurable-server-version-in-ping-response.patch → BungeeCord-Patches/0026-Configurable-server-version-in-ping-response.patch
View File

@ -1,4 +1,4 @@
From 9ddaf6095bd50bf2c70d7fbf08bec00b0060105d Mon Sep 17 00:00:00 2001
From 78e1ea37862e6be4179f8477fbdb69ce36af6233 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response
@ -79,5 +79,5 @@ index 5af9c3bb..166565a7 100644
@Override
--
2.40.1.windows.1
2.42.0

12
BungeeCord-Patches/0028-Add-timeout-variant-to-connect-methods.patch → BungeeCord-Patches/0027-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From 57112a8044943dd7303081a47fc826d3c339154e Mon Sep 17 00:00:00 2001
From b624f9224f0de6b440be2830fcf51b2e8cb21c30 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods
@ -6,7 +6,7 @@ Subject: [PATCH] Add timeout variant to connect methods
Also added more connect methods to ProxiedPlayer, in addition to the new method
diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
index e7ab62e5..684eb883 100644
index c3848b3c..a441a424 100644
--- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
+++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java
@@ -126,6 +126,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
@ -75,10 +75,10 @@ index e7ab62e5..684eb883 100644
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 8268e30b..ccb9efdc 100644
index e37d502b..07cfe1d5 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -255,9 +255,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -259,9 +259,20 @@ public final class UserConnection implements ProxiedPlayer
public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
{
@ -99,7 +99,7 @@ index 8268e30b..ccb9efdc 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -351,7 +362,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -355,7 +366,7 @@ public final class UserConnection implements ProxiedPlayer
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
sendMessage( bungee.getTranslation( "fallback_lobby" ) );
@ -109,5 +109,5 @@ index 8268e30b..ccb9efdc 100644
{
disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
--
2.35.3
2.42.0

4
BungeeCord-Patches/0029-Proxy-query-event.patch → BungeeCord-Patches/0028-Proxy-query-event.patch
View File

@ -1,4 +1,4 @@
From dad0bc898469685c8de63dd5fba41e50d048da34 Mon Sep 17 00:00:00 2001
From 02d85afb1a967d4b744be4c31c4709e3d20fb0f1 Mon Sep 17 00:00:00 2001
From: minecrafter <unknown@unknown>
Date: Sun, 3 Jul 2016 04:03:21 -0400
Subject: [PATCH] Proxy query event
@ -211,5 +211,5 @@ index 9b81197f..ac99d02c 100644
} else
{
--
2.30.1 (Apple Git-130)
2.42.0

10
BungeeCord-Patches/0030-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch → BungeeCord-Patches/0029-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch
View File

@ -1,11 +1,11 @@
From a74bf9b63a72510f15b4a3aec96d28209348538b Mon Sep 17 00:00:00 2001
From eeabca32aaa97aa0b442bfd3a41784225d9b3dca Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 4 Aug 2016 19:30:49 -0700
Subject: [PATCH] Dump the raw hex of a packet on a decoding error
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index 5e03e175..961887c9 100644
index 0244ec1a..776a0603 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -1,7 +1,9 @@
@ -18,7 +18,7 @@ index 5e03e175..961887c9 100644
import io.netty.handler.codec.MessageToMessageDecoder;
import java.util.List;
import lombok.AllArgsConstructor;
@@ -38,13 +40,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -40,13 +42,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
Protocol.DirectionData prot = ( server ) ? protocol.TO_SERVER : protocol.TO_CLIENT;
ByteBuf slice = in.copy(); // Can't slice this one due to EntityMap :(
@ -35,7 +35,7 @@ index 5e03e175..961887c9 100644
packet.read( in, prot.getDirection(), protocolVersion );
if ( in.isReadable() )
@@ -58,6 +63,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -60,6 +65,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
out.add( new PacketWrapper( packet, slice ) );
slice = null;
@ -53,5 +53,5 @@ index 5e03e175..961887c9 100644
{
if ( slice != null )
--
2.30.1 (Apple Git-130)
2.42.0

83
BungeeCord-Patches/0031-Fix-potion-race-condition-on-Forge-1.8.9.patch → BungeeCord-Patches/0030-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,71 +1,28 @@
From ffc7cfe376ea12c3232492bcaad76e04c6b138db Mon Sep 17 00:00:00 2001
From ce79efbdf45d665fd0f018cae81294db0245c262 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
index 88865b85..0c334afc 100644
index 0f8f5885..b3c8c6e2 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
@@ -10,6 +10,8 @@ import net.md_5.bungee.protocol.packet.ClientStatus;
import net.md_5.bungee.protocol.packet.Commands;
import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.EncryptionResponse;
+import net.md_5.bungee.protocol.packet.EntityEffect; // Waterfall
+import net.md_5.bungee.protocol.packet.EntityRemoveEffect; // Waterfall
import net.md_5.bungee.protocol.packet.EntityStatus;
import net.md_5.bungee.protocol.packet.GameState;
import net.md_5.bungee.protocol.packet.Handshake;
@@ -223,4 +225,14 @@ public abstract class AbstractPacketHandler
public void handle(ServerData serverData) throws Exception
@@ -238,4 +238,14 @@ public abstract class AbstractPacketHandler
public void handle(FinishConfiguration finishConfiguration) throws Exception
{
}
+
+ // Waterfall start
+ public void handle(EntityEffect entityEffect) throws Exception
+ public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception
+ {
+ }
+
+ public void handle(EntityRemoveEffect removeEffect) throws Exception
+ public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
+ {
+ }
+ // Waterfall end
}
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 dabfa4db..7e0c4f7a 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
@@ -20,6 +20,8 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
import net.md_5.bungee.protocol.packet.EncryptionResponse;
import net.md_5.bungee.protocol.packet.EntityStatus;
import net.md_5.bungee.protocol.packet.GameState;
+import net.md_5.bungee.protocol.packet.EntityEffect;
+import net.md_5.bungee.protocol.packet.EntityRemoveEffect;
import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
@@ -140,6 +142,20 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_19, 0x0A ),
map( ProtocolConstants.MINECRAFT_1_19_4, 0xB )
);
+ // Waterfall start
+ TO_CLIENT.registerPacket(
+ EntityEffect.class,
+ EntityEffect::new,
+ map(ProtocolConstants.MINECRAFT_1_8, 0x1D),
+ map(ProtocolConstants.MINECRAFT_1_9, -1)
+ );
+ TO_CLIENT.registerPacket(
+ EntityRemoveEffect.class,
+ EntityRemoveEffect::new,
+ map(ProtocolConstants.MINECRAFT_1_8, 0x1E),
+ map(ProtocolConstants.MINECRAFT_1_9, -1)
+ );
+ // Waterfall end
TO_CLIENT.registerPacket(
PlayerListItem.class, // PlayerInfo
PlayerListItem::new,
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EntityEffect.java
new file mode 100644
index 00000000..d11a9ea9
@ -160,7 +117,7 @@ index 00000000..7ed2dc3a
+ }
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 846f8338..7fe08ecd 100644
index 07cfe1d5..c74e44b5 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -1,7 +1,9 @@
@ -173,31 +130,11 @@ index 846f8338..7fe08ecd 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -125,6 +127,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard();
@Getter
private final Collection<UUID> sentBossBars = new HashSet<>();
+ // Waterfall start
+ @Getter
+ private final Multimap<Integer, Integer> potions = HashMultimap.create();
+ // Waterfall end
/*========================================================================*/
@Getter
private String displayName;
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 e8ef17a1..c7180803 100644
index 30fbb0b1..102eb1a8 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -51,6 +51,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.ProtocolConstants;
import net.md_5.bungee.protocol.packet.BossBar;
import net.md_5.bungee.protocol.packet.Commands;
+import net.md_5.bungee.protocol.packet.EntityEffect;
+import net.md_5.bungee.protocol.packet.EntityRemoveEffect;
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
import net.md_5.bungee.protocol.packet.PlayerListItem;
@@ -682,6 +684,32 @@ public class DownstreamBridge extends PacketHandler
@@ -737,6 +737,32 @@ public class DownstreamBridge extends PacketHandler
}
}
@ -268,5 +205,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.37.3.windows.1
2.42.0

6
BungeeCord-Patches/0032-Optionally-use-async-Netty-DNS-resolver.patch → BungeeCord-Patches/0031-Optionally-use-async-Netty-DNS-resolver.patch
View File

@ -1,4 +1,4 @@
From c9bd6b4fc34e508d86cfc04bb5adec3f33a56f38 Mon Sep 17 00:00:00 2001
From fe8d22926e5d35ec817b333c8546f8ba527ead79 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver
@ -24,7 +24,7 @@ index 749059ab..6141128b 100644
/**
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 233c6aae..54061ec5 100644
index c0a8ae4c..342551a6 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -34,6 +34,18 @@
@ -175,5 +175,5 @@ index e0c52f21..37337429 100644
+ // Waterfall End
}
--
2.17.2 (Apple Git-113)
2.42.0

4
BungeeCord-Patches/0033-Improve-outdated-build-message.patch → BungeeCord-Patches/0032-Improve-outdated-build-message.patch
View File

@ -1,4 +1,4 @@
From a9437edffbbe4bbee2b0521cf894a413c845a3cc Mon Sep 17 00:00:00 2001
From b82eb7c8e4f2c431657cf51961df1c9f67b426e0 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sat, 10 Jun 2017 20:56:02 +0100
Subject: [PATCH] Improve outdated build message
@ -26,5 +26,5 @@ index 39fc55f9..c81a4430 100644
}
--
2.38.1
2.42.0

4
BungeeCord-Patches/0034-Fix-some-forge-plugin-message-packets-not-being-forw.patch → BungeeCord-Patches/0033-Fix-some-forge-plugin-message-packets-not-being-forw.patch
View File

@ -1,4 +1,4 @@
From 71d876da0ca5d9b2c2a17f04dad395c80d22fcdc Mon Sep 17 00:00:00 2001
From 31f57df948a2fecc483cef4359d77e7c7e5e493d Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Mon, 17 Jul 2017 20:24:17 +0100
Subject: [PATCH] Fix some forge plugin message packets not being forwarded
@ -55,5 +55,5 @@ index 77d18e6d..d254b84e 100644
synchronized ( packetQueue )
{
--
2.30.1 (Apple Git-130)
2.42.0

32
BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch → BungeeCord-Patches/0034-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 8e7c12064010cb7ea8137814837f97a2b1ca1e9e Mon Sep 17 00:00:00 2001
From f0bc70621c1957e310e814708854a5674129f7aa Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -6,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index e5797d70..8328e576 100644
index 07d49112..672a813d 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -233,7 +233,7 @@ index 00000000..cfd039cd
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index 1bf8b510..d333a528 100644
index a6684b7c..57ee7f23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,12 +55,13 @@
@ -253,7 +253,7 @@ index 1bf8b510..d333a528 100644
</modules>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index aa91ee5a..83d8719b 100644
index 342551a6..d3de9e34 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -71,7 +71,7 @@
@ -271,8 +271,8 @@ index aa91ee5a..83d8719b 100644
</dependency>
+ <!-- // Waterfall - We already bundle an slf4j impl
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-slf4j</artifactId>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-slf4j</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
- </dependency>
@ -281,7 +281,7 @@ index aa91ee5a..83d8719b 100644
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
@@ -130,6 +131,35 @@
<version>1.9.10</version>
<version>1.7.3</version>
<scope>runtime</scope>
</dependency>
+ <!-- Waterfall start - Console improvements - bring back slf4j-->
@ -561,7 +561,7 @@ index 7e465924..00000000
-</project-shared-configuration>
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
deleted file mode 100644
index 58a25501..00000000
index b7529bf3..00000000
--- a/slf4j/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
@ -571,18 +571,18 @@ index 58a25501..00000000
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
- <version>1.20-R0.1-SNAPSHOT</version>
- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-super</artifactId>
- <version>dev-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-slf4j</artifactId>
- <version>1.20-R0.1-SNAPSHOT</version>
- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-slf4j</artifactId>
- <version>1.20-R0.2-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>BungeeCord-SLF4J</name>
- <name>Waterfall-SLF4J</name>
- <description>Wrapper over SLF4J for BungeeCord purposes.</description>
-
- <properties>
@ -1629,5 +1629,5 @@ index 21a48df6..00000000
-
-}
--
2.41.0
2.42.0

4
BungeeCord-Patches/0036-Handle-plugin-prefixes-using-Log4J.patch → BungeeCord-Patches/0035-Handle-plugin-prefixes-using-Log4J.patch
View File

@ -1,4 +1,4 @@
From c5f2b6c6c44ec721a353ee2c3621feca1f75b70a Mon Sep 17 00:00:00 2001
From ee8508af13a1c8addcd54fb2fddb5e366541b252 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:07:31 +0200
Subject: [PATCH] Handle plugin prefixes using Log4J
@ -45,5 +45,5 @@ index cfd039cd..8e49e002 100644
<TimeBasedTriggeringPolicy />
<OnStartupTriggeringPolicy />
--
2.35.1
2.42.0

22
BungeeCord-Patches/0037-Allow-plugins-to-use-SLF4J-for-logging.patch → BungeeCord-Patches/0036-Allow-plugins-to-use-SLF4J-for-logging.patch
View File

@ -1,25 +1,9 @@
From 477511185022dd5740bc7c4dbf3f6ab5787ed49e Mon Sep 17 00:00:00 2001
From 0c79b259f553abdc617e0aa12b53f54d3e47a7d1 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
diff --git a/api/pom.xml b/api/pom.xml
index 83ae2220..01b8f888 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -75,5 +75,11 @@
<version>2.0</version>
<scope>compile</scope>
</dependency>
+ <!-- Waterfall - Add SLF4J -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.36</version>
+ </dependency>
</dependencies>
</project>
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java b/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
index 9660234d..3d1e9a3a 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
@ -39,7 +23,7 @@ index 9660234d..3d1e9a3a 100644
* Called when the plugin has just been loaded. Most of the proxy will not
* be initialized, so only use it for registering
diff --git a/log4j/pom.xml b/log4j/pom.xml
index a7d2aa8f..976b8079 100644
index 1cc7936e..e83b2f21 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -38,6 +38,24 @@
@ -68,5 +52,5 @@ index a7d2aa8f..976b8079 100644
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
--
2.41.0.windows.1
2.42.0

4
BungeeCord-Patches/0038-Add-Log4j-configuration-that-replicates-the-old-Bung.patch → BungeeCord-Patches/0037-Add-Log4j-configuration-that-replicates-the-old-Bung.patch
View File

@ -1,4 +1,4 @@
From 3d6b47a2d059f408afdcd3e65c60ba6a127a2e4b Mon Sep 17 00:00:00 2001
From 27d38f7079c9069b6568d6d7042d8e2e1422afea Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Sun, 24 Sep 2017 12:06:49 +0200
Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord
@ -47,5 +47,5 @@ index 00000000..6e9c09c5
+ </Loggers>
+</Configuration>
--
2.30.1 (Apple Git-130)
2.42.0

4
BungeeCord-Patches/0039-Add-console-command-completion.patch → BungeeCord-Patches/0038-Add-console-command-completion.patch
View File

@ -1,4 +1,4 @@
From eb704457c300f3f8ab8a28a784a926e746554119 Mon Sep 17 00:00:00 2001
From 06e1719230949423936c9a395802628a77f09a76 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 26 Sep 2017 18:59:37 +0200
Subject: [PATCH] Add console command completion
@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
}
--
2.37.3.windows.1
2.42.0

8
BungeeCord-Patches/0040-Providing-access-to-the-player-s-LoginResult-on-Logi.patch → BungeeCord-Patches/0039-Providing-access-to-the-player-s-LoginResult-on-Logi.patch
View File

@ -1,4 +1,4 @@
From 730364aac5da3bcc5448a242e4d3b6f8525e2528 Mon Sep 17 00:00:00 2001
From c758a573aca65b1bb5e71a016b0c06a5673b2700 Mon Sep 17 00:00:00 2001
From: phenomax <phenomax@revayd.net>
Date: Thu, 10 Aug 2017 18:41:17 +0200
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@ -52,10 +52,10 @@ similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index cd0a459c..935daa5d 100644
index 72dad6d3..dfe63771 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -627,7 +627,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -618,7 +618,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
};
// fire login event
@ -65,5 +65,5 @@ index cd0a459c..935daa5d 100644
@Override
--
2.38.1
2.42.0

8
BungeeCord-Patches/0041-Optionally-log-InitialHandler-connections.patch → BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch
View File

@ -1,4 +1,4 @@
From 519419cfd04478fc029bcc932a5dc5b102410f2a Mon Sep 17 00:00:00 2001
From f4fead4cd59131552737c497b7f7a0b583b2bdb0 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Thu, 8 Feb 2018 19:10:52 +0100
Subject: [PATCH] Optionally log InitialHandler connections
@ -61,10 +61,10 @@ index ef44d334..4ff8da6d 100644
public String getGameVersion() {
return gameVersion;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 935daa5d..ddc04fda 100644
index dfe63771..2c70d1f9 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -355,7 +355,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -357,7 +357,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break;
case 2:
// Login
@ -77,5 +77,5 @@ index 935daa5d..ddc04fda 100644
ch.setProtocol( Protocol.LOGIN );
--
2.38.1
2.42.0

6
BungeeCord-Patches/0042-Forge-is-a-first-class-citizen.patch → BungeeCord-Patches/0041-Forge-is-a-first-class-citizen.patch
View File

@ -1,11 +1,11 @@
From 270491b5947c02fdb02fa2ef25a5741f1e9465cb Mon Sep 17 00:00:00 2001
From 06d7c7b413033551477403e14189e9deb92641a5 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 22f5243f..ef4e5edf 100644
index 71bb3d9d..5cc308b8 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -290,8 +290,6 @@ public class BungeeCord extends ProxyServer
@ -31,5 +31,5 @@ index 7094fe0b..8911bee8 100644
@Synchronized("serversLock") // Waterfall
public void load()
--
2.38.1
2.42.0

10
BungeeCord-Patches/0043-Ignore-empty-packets.patch → BungeeCord-Patches/0042-Ignore-empty-packets.patch
View File

@ -1,4 +1,4 @@
From 3edeced9d513fbec1cbcc5cb8600907633e23b68 Mon Sep 17 00:00:00 2001
From 7aae27e71a89d2753226c4f8340560fd06ab4db1 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 12 Oct 2018 14:28:52 +0100
Subject: [PATCH] Ignore empty packets
@ -8,10 +8,10 @@ packets will be ignored. While empty packets are a sign of bad plugins,
they are effectivly harmless vs the cost of the exception in general
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index 961887c9..8b7e0708 100644
index 776a0603..fa021598 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -43,6 +43,12 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -45,6 +45,12 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
Object packetTypeInfo = null;
try
{
@ -25,7 +25,7 @@ index 961887c9..8b7e0708 100644
packetTypeInfo = packetId;
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
index 647394ba..f297620c 100644
index 277e70e8..cf7dea17 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
@@ -40,7 +40,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
@ -38,5 +38,5 @@ index 647394ba..f297620c 100644
throw new CorruptedFrameException( "Empty Packet!" );
}
--
2.30.1 (Apple Git-130)
2.42.0

4
BungeeCord-Patches/0044-Don-t-use-a-bytebuf-for-packet-decoding.patch → BungeeCord-Patches/0043-Don-t-use-a-bytebuf-for-packet-decoding.patch
View File

@ -1,4 +1,4 @@
From bc1b94faf6edb72a90f148a3638fff1de2eabcf4 Mon Sep 17 00:00:00 2001
From 4510748e71ed701c4179156e3d3bf84226775558 Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Thu, 17 Jan 2019 03:25:59 +0000
Subject: [PATCH] Don't use a bytebuf for packet decoding
@ -66,5 +66,5 @@ index cf7dea17..3a802ca4 100644
}
}
--
2.40.0
2.42.0

30
BungeeCord-Patches/0045-Provide-an-option-to-disable-entity-metadata-rewriti.patch → BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From acaac51b18fa6e8bc1f2b1dacc77565ff7595648 Mon Sep 17 00:00:00 2001
From 3be2c70b1860141a74772aa85bdbfb6c91b7d1f2 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,10 +57,10 @@ 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 6473a10c..60232e52 100644
index 2624dd37..c3268cbe 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -240,7 +240,7 @@ public class ServerConnector extends PacketHandler
@@ -255,7 +255,7 @@ public class ServerConnector extends PacketHandler
ch.write( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:register" : "REGISTER", Joiner.on( "\0" ).join( registeredChannels ).getBytes( StandardCharsets.UTF_8 ), false ) );
}
@ -69,7 +69,7 @@ index 6473a10c..60232e52 100644
{
ch.write( user.getSettings() );
}
@@ -295,6 +295,7 @@ public class ServerConnector extends PacketHandler
@@ -310,6 +310,7 @@ public class ServerConnector extends PacketHandler
user.getTabListHandler().onServerChange();
Scoreboard serverScoreboard = user.getServerSentScoreboard();
@ -77,7 +77,7 @@ index 6473a10c..60232e52 100644
for ( Objective objective : serverScoreboard.getObjectives() )
{
user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) );
@@ -307,6 +308,7 @@ public class ServerConnector extends PacketHandler
@@ -322,6 +323,7 @@ public class ServerConnector extends PacketHandler
{
user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) );
}
@ -85,7 +85,7 @@ index 6473a10c..60232e52 100644
serverScoreboard.clear();
for ( UUID bossbar : user.getSentBossBars() )
@@ -325,13 +327,33 @@ public class ServerConnector extends PacketHandler
@@ -340,13 +342,33 @@ public class ServerConnector extends PacketHandler
}
user.setDimensionChange( true );
@ -93,7 +93,7 @@ index 6473a10c..60232e52 100644
+ if ( !user.isDisableEntityMetadataRewrite() && login.getDimension() == user.getDimension() ) // Waterfall - defer
{
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, login.getDeathLocation(), login.getPortalCooldown() ) );
(byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
}
user.setServerEntityId( login.getEntityId() );
@ -118,10 +118,10 @@ index 6473a10c..60232e52 100644
+ }
+ // Waterfall end
user.unsafe().sendPacket( new Respawn( login.getDimension(), login.getWorldName(), login.getSeed(), login.getDifficulty(), login.getGameMode(), login.getPreviousGameMode(), login.getLevelType(), login.isDebug(), login.isFlat(),
false, login.getDeathLocation(), login.getPortalCooldown() ) );
(byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index e0a9d338..35bf4c9f 100644
index c74e44b5..9e933b1d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -775,4 +775,10 @@ public final class UserConnection implements ProxiedPlayer
@ -136,10 +136,10 @@ index e0a9d338..35bf4c9f 100644
+ // Waterfall end
}
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 c7180803..04840037 100644
index 102eb1a8..a2995c60 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -688,6 +688,7 @@ public class DownstreamBridge extends PacketHandler
@@ -741,6 +741,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityEffect entityEffect) throws Exception
{
@ -147,7 +147,7 @@ index c7180803..04840037 100644
// Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
// condition on the client.
if (this.con.getForgeClientHandler().isForgeUser() && !this.con.getForgeClientHandler().isHandshakeComplete()) {
@@ -699,6 +700,7 @@ public class DownstreamBridge extends PacketHandler
@@ -752,6 +753,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityRemoveEffect removeEffect) throws Exception
{
@ -156,7 +156,7 @@ index c7180803..04840037 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 4dde5cff..65ea8044 100644
index c033118f..69accd42 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
@@ -27,6 +27,11 @@ public abstract class EntityMap
@ -171,7 +171,7 @@ index 4dde5cff..65ea8044 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -298,7 +303,13 @@ public abstract class EntityMap
@@ -300,7 +305,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -224,5 +224,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.41.0.windows.1
2.42.0

21
BungeeCord-Patches/0046-Add-ProxyDefineCommandsEvent.patch → BungeeCord-Patches/0045-Add-ProxyDefineCommandsEvent.patch
View File

@ -1,4 +1,4 @@
From 1723728a7c34cc7d08fa4c4c4f172e0656835716 Mon Sep 17 00:00:00 2001
From 48553841b229f3e21ce0363be925f17657d4b8ef Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 14 Mar 2019 07:44:06 +0000
Subject: [PATCH] Add ProxyDefineCommandsEvent
@ -54,27 +54,16 @@ index 00000000..1fd4fc90
+
+}
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 5105df8b..490171c4 100644
index a2995c60..e05e746c 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -19,8 +19,10 @@ import io.netty.channel.unix.DomainSocketAddress;
import java.io.DataInput;
import java.net.InetSocketAddress;
import java.util.ArrayList;
+import java.util.HashMap; // Waterfall
import java.util.List;
import java.util.Map;
+import java.util.Objects; // Waterfall
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.ServerConnection;
import net.md_5.bungee.ServerConnection.KeepAliveData;
@@ -723,9 +725,25 @@ public class DownstreamBridge extends PacketHandler
@@ -776,9 +776,25 @@ public class DownstreamBridge extends PacketHandler
{
boolean modified = false;
- for ( Map.Entry<String, Command> command : bungee.getPluginManager().getCommands() )
+ // Waterfall start
+ Map<String, Command> commandMap = new HashMap<>();
+ Map<String, Command> commandMap = new java.util.HashMap<>();
+ for ( Map.Entry<String, Command> commandEntry : bungee.getPluginManager().getCommands() ) {
+ if ( !bungee.getDisabledCommands().contains( commandEntry.getKey() )
+ && commands.getRoot().getChild( commandEntry.getKey() ) == null
@ -97,5 +86,5 @@ index 5105df8b..490171c4 100644
CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
.then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
--
2.38.1
2.42.0

4
BungeeCord-Patches/0047-Fix-upstream-javadocs.patch → BungeeCord-Patches/0046-Fix-upstream-javadocs.patch
View File

@ -1,4 +1,4 @@
From 658ea2fe15fc6d455beb8cc4d5d271e29fcb155d Mon Sep 17 00:00:00 2001
From c6f351aa810086f14135c2821ae060c54905fe0d Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 30 Mar 2019 15:11:11 +0000
Subject: [PATCH] Fix upstream javadocs
@ -104,5 +104,5 @@ index f3bced0a..4a198ee9 100644
Favicon getFaviconObject();
--
2.37.2
2.42.0

4
BungeeCord-Patches/0048-OSX-native-zlib-and-crypto.patch → BungeeCord-Patches/0047-OSX-native-zlib-and-crypto.patch
View File

@ -1,4 +1,4 @@
From 893c4dbda0b4fa64d720f3ec510965b5aeb9df3f Mon Sep 17 00:00:00 2001
From 0a62f3f1c21e3d233984a5c791a8f01edc3c4ecc Mon Sep 17 00:00:00 2001
From: Colin Godsey <crgodsey@gmail.com>
Date: Tue, 16 Apr 2019 07:25:52 -0600
Subject: [PATCH] OSX native zlib and crypto
@ -1215,5 +1215,5 @@ literal 0
HcmV?d00001
--
2.37.2
2.42.0

18
BungeeCord-Patches/0049-Speed-up-some-common-exceptions.patch → BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From a01c62131014500d4a4bb25aa7afaaf738a3342b Mon Sep 17 00:00:00 2001
From c1ce17266ec28c0dcc4ed252223c856eb327d2e3 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 25 Nov 2019 19:54:06 +0000
Subject: [PATCH] Speed up some common exceptions
@ -67,10 +67,10 @@ index 6c0ef4df..f20104a2 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index 111802f7..d3559188 100644
index c1017e60..5ecb5c93 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -22,6 +22,9 @@ import se.llbit.nbt.Tag;
@@ -24,6 +24,9 @@ import se.llbit.nbt.Tag;
public abstract class DefinedPacket
{
@ -80,7 +80,7 @@ index 111802f7..d3559188 100644
public static void writeString(String s, ByteBuf buf)
{
writeString( s, buf, Short.MAX_VALUE );
@@ -148,13 +151,18 @@ public abstract class DefinedPacket
@@ -150,13 +153,18 @@ public abstract class DefinedPacket
byte in;
while ( true )
{
@ -133,10 +133,10 @@ index 00000000..2583aa2c
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index b68b33a9..f5e414c1 100644
index fa021598..aaf1269e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -78,7 +78,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -80,7 +80,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
} else {
packetTypeStr = "unknown";
}
@ -146,7 +146,7 @@ index b68b33a9..f5e414c1 100644
{
if ( slice != null )
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 707232a5..600037f4 100644
index 2c70d1f9..186c3890 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -16,6 +16,8 @@ import java.util.Set;
@ -158,7 +158,7 @@ index 707232a5..600037f4 100644
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
@@ -471,6 +473,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -473,6 +475,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644
// Waterfall start
--
2.38.1
2.42.0

4
BungeeCord-Patches/0050-ConnectionInitEvent.patch → BungeeCord-Patches/0049-ConnectionInitEvent.patch
View File

@ -1,4 +1,4 @@
From 7bca0d049e00a28e4cedbfcccc7f02a5572ecb57 Mon Sep 17 00:00:00 2001
From 888d05f5fba61d8aa230eebe869bce7e5c19fe82 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 2 Dec 2019 11:35:17 +0000
Subject: [PATCH] ConnectionInitEvent
@ -119,5 +119,5 @@ index 3f30da0c..af65e192 100644
};
public static final Base BASE = new Base( false );
--
2.40.0
2.42.0

6
BungeeCord-Patches/0051-Add-exception-reporting-event.patch → BungeeCord-Patches/0050-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From d3707353a4b8be0fa47a5fa155bb44520914a383 Mon Sep 17 00:00:00 2001
From 119f063e02dec807420e098e1e4b8b1675ab115d Mon Sep 17 00:00:00 2001
From: theminecoder <theminecoder.dev@gmail.com>
Date: Wed, 22 Apr 2020 14:00:44 +1000
Subject: [PATCH] Add exception reporting event
@ -642,7 +642,7 @@ index fbfbd546..ae85a1d4 100644
@EventHandler
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index ef4e5edf..15fb4ad2 100644
index 5cc308b8..3a86fac8 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -11,6 +11,8 @@ import com.google.gson.Gson;
@ -695,5 +695,5 @@ index 38b75b51..02ec98fc 100644
// If we have a period of 0 or less, only run once
--
2.37.3.windows.1
2.42.0

8
BungeeCord-Patches/0052-Allow-to-disable-tablist-rewrite.patch → BungeeCord-Patches/0051-Allow-to-disable-tablist-rewrite.patch
View File

@ -1,4 +1,4 @@
From 7d1a9e8645b530dc87f51d40cec9ba8ce3f6edac Mon Sep 17 00:00:00 2001
From e6f5612067c9f90985f0e3d2f4359b176b2ac81d Mon Sep 17 00:00:00 2001
From: xDark <aleshkailyashevich@gmail.com>
Date: Fri, 31 May 2019 08:11:31 +0300
Subject: [PATCH] Allow to disable tablist rewrite
@ -50,10 +50,10 @@ index e860214f..b88e3c8a 100644
+ }
}
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 490171c4..0c9cfb02 100644
index e05e746c..006c7133 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -170,8 +170,14 @@ public class DownstreamBridge extends PacketHandler
@@ -173,8 +173,14 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(PlayerListItem playerList) throws Exception
{
@ -71,5 +71,5 @@ index 490171c4..0c9cfb02 100644
@Override
--
2.38.1
2.42.0

8
BungeeCord-Patches/0053-Remove-version-from-brand-info.patch → BungeeCord-Patches/0052-Remove-version-from-brand-info.patch
View File

@ -1,14 +1,14 @@
From bb5732db8c6fa66d335f6d46b3c07f9444a613c7 Mon Sep 17 00:00:00 2001
From 20f457fb1fb59705bfdcdf18850ada9533d98b76 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/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 0c9cfb02..89b98b36 100644
index 006c7133..485af04f 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -316,7 +316,7 @@ public class DownstreamBridge extends PacketHandler
@@ -319,7 +319,7 @@ public class DownstreamBridge extends PacketHandler
Preconditions.checkState( !serverBrand.contains( bungee.getName() ), "Cannot connect proxy to itself!" );
brand = ByteBufAllocator.DEFAULT.heapBuffer();
@ -18,5 +18,5 @@ index 0c9cfb02..89b98b36 100644
brand.release();
// changes in the packet are ignored so we need to send it manually
--
2.38.1
2.42.0

10
BungeeCord-Patches/0054-Add-auth-url-option.patch → BungeeCord-Patches/0053-Add-auth-url-option.patch
View File

@ -1,14 +1,14 @@
From e07001b69a3370c95044abfd165571726c00e20c Mon Sep 17 00:00:00 2001
From b8873d3a2b533a0fb20e2280f49ea882e5490def Mon Sep 17 00:00:00 2001
From: theminecoder <theminecoder.dev@gmail.com>
Date: Sun, 19 Jul 2020 10:18:23 +1000
Subject: [PATCH] Add auth url option
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 4346696f..55620acc 100644
index 186c3890..699fecb8 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -76,6 +76,8 @@ import net.md_5.bungee.util.QuietException;
@@ -77,6 +77,8 @@ import net.md_5.bungee.util.QuietException;
public class InitialHandler extends PacketHandler implements PendingConnection
{
@ -17,7 +17,7 @@ index 4346696f..55620acc 100644
private final BungeeCord bungee;
private ChannelWrapper ch;
@Getter
@@ -499,7 +501,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -501,7 +503,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
String encodedHash = URLEncoder.encode( new BigInteger( sha.digest() ).toString( 16 ), "UTF-8" );
String preventProxy = ( BungeeCord.getInstance().config.isPreventProxyConnections() && getSocketAddress() instanceof InetSocketAddress ) ? "&ip=" + URLEncoder.encode( getAddress().getAddress().getHostAddress(), "UTF-8" ) : "";
@ -27,5 +27,5 @@ index 4346696f..55620acc 100644
Callback<String> handler = new Callback<String>()
{
--
2.38.1
2.42.0

4
BungeeCord-Patches/0055-Add-the-ability-to-generate-decoder-traces-for-debug.patch → BungeeCord-Patches/0054-Add-the-ability-to-generate-decoder-traces-for-debug.patch
View File

@ -1,4 +1,4 @@
From b6366cee1ab16d0c0ec04efd433f12e118206ad0 Mon Sep 17 00:00:00 2001
From 371ddbcc82209081407cc1c3ed8af7a154ab6ce8 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 15 Sep 2020 18:11:49 +0100
Subject: [PATCH] Add the ability to generate decoder traces for debugging
@ -40,5 +40,5 @@ index 2583aa2c..334d5054 100644
}
}
--
2.37.2
2.42.0

24
BungeeCord-Patches/0056-Additional-DoS-mitigations.patch → BungeeCord-Patches/0055-Additional-DoS-mitigations.patch
View File

@ -1,4 +1,4 @@
From 811cfe0f1dfcae2fff7c333beb3a28ddbbf4d221 Mon Sep 17 00:00:00 2001
From 26861289a9683ec96f6b49005533cd96d77345ed Mon Sep 17 00:00:00 2001
From: "Five (Xer)" <admin@fivepb.me>
Date: Sat, 30 Jan 2021 18:04:14 +0100
Subject: [PATCH] Additional DoS mitigations
@ -8,10 +8,10 @@ Courtesy of Tux and the Velocity Contributors. See:
https://github.com/VelocityPowered/Velocity/commit/5ceac16a821ea35572ff11412ace8929fd06e278
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index d3559188..59f2cb73 100644
index 5ecb5c93..70ec6c53 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -57,6 +57,7 @@ public abstract class DefinedPacket
@@ -59,6 +59,7 @@ public abstract class DefinedPacket
int len = readVarInt( buf );
if ( len > maxLen * 3 )
{
@ -19,7 +19,7 @@ index d3559188..59f2cb73 100644
throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
}
@@ -65,6 +66,7 @@ public abstract class DefinedPacket
@@ -67,6 +68,7 @@ public abstract class DefinedPacket
if ( s.length() > maxLen )
{
@ -27,7 +27,7 @@ index d3559188..59f2cb73 100644
throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
}
@@ -396,4 +398,21 @@ public abstract class DefinedPacket
@@ -424,4 +426,21 @@ public abstract class DefinedPacket
@Override
public abstract String toString();
@ -50,7 +50,7 @@ index d3559188..59f2cb73 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index f5e414c1..ac83e325 100644
index aaf1269e..b89a2e16 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -3,7 +3,7 @@ package net.md_5.bungee.protocol;
@ -62,7 +62,7 @@ index f5e414c1..ac83e325 100644
import io.netty.handler.codec.MessageToMessageDecoder;
import java.util.List;
import lombok.AllArgsConstructor;
@@ -56,10 +56,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -58,10 +58,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
if ( packet != null )
{
packetTypeInfo = packet.getClass();
@ -79,7 +79,7 @@ index f5e414c1..ac83e325 100644
throw new BadPacketException( "Packet " + protocol + ":" + prot.getDirection() + "/" + packetId + " (" + packet.getClass().getSimpleName() + ") larger than expected, extra bytes: " + in.readableBytes() );
}
} else
@@ -70,6 +76,11 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -72,6 +78,11 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
out.add( new PacketWrapper( packet, slice ) );
slice = null;
} catch (BadPacketException | IndexOutOfBoundsException e) {
@ -91,7 +91,7 @@ index f5e414c1..ac83e325 100644
final String packetTypeStr;
if (packetTypeInfo instanceof Integer) {
packetTypeStr = "id " + Integer.toHexString((Integer) packetTypeInfo);
@@ -87,4 +98,52 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -89,4 +100,52 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
}
}
}
@ -167,10 +167,10 @@ index 63e9d18d..545eec72 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
index 5186a6a8..3224b0d2 100644
index e62a3a03..9789215c 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
@@ -65,4 +65,13 @@ public class LoginRequest extends DefinedPacket
@@ -71,4 +71,13 @@ public class LoginRequest extends DefinedPacket
{
handler.handle( this );
}
@ -235,5 +235,5 @@ index 738f0c92..ec33d337 100644
+ // Waterfall end
}
--
2.38.1
2.42.0

4
BungeeCord-Patches/0057-Add-support-for-hex-color-codes-in-console.patch → BungeeCord-Patches/0056-Add-support-for-hex-color-codes-in-console.patch
View File

@ -1,4 +1,4 @@
From 792b25bd6d93cdf296150f8cce4dc127faf835e0 Mon Sep 17 00:00:00 2001
From 6f4f56effdd7fee9fb14aadbc893434ede4da78f Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Sun, 21 Feb 2021 23:52:11 -0500
Subject: [PATCH] Add support for hex color codes in console
@ -242,5 +242,5 @@ index 00000000..5d1a6126
+}
+
--
2.37.2
2.42.0

8
BungeeCord-Patches/0058-Configurable-plugin-messaging-limits.patch → BungeeCord-Patches/0057-Configurable-plugin-messaging-limits.patch
View File

@ -1,4 +1,4 @@
From 5b38d62ee22949fb09c3b833d49b73c10f52d32b Mon Sep 17 00:00:00 2001
From 8bae6fb2c4cdab54ff43b787c6eeef1ee7855f3d Mon Sep 17 00:00:00 2001
From: FivePB <admin@fivepb.me>
Date: Tue, 16 Nov 2021 21:15:32 +0100
Subject: [PATCH] Configurable plugin messaging limits
@ -83,10 +83,10 @@ index b88e3c8a..da0efa36 100644
+ }
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index d31901cc..e3447ee4 100644
index 699fecb8..9a3c4809 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -755,9 +755,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -777,9 +777,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
for ( String id : content.split( "\0" ) )
{
@ -101,5 +101,5 @@ index d31901cc..e3447ee4 100644
}
} else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
--
2.40.1.windows.1
2.42.0

6
BungeeCord-Patches/0059-ServerConnectRequest-sendFeedback.patch → BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch
View File

@ -1,4 +1,4 @@
From 1a76bca6c617df82e2f9d0fa7457d6b727eabb71 Mon Sep 17 00:00:00 2001
From f5ddca96ef3353bc21ba8b63b1be12437c0e8424 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 16 Apr 2021 06:29:28 +0100
Subject: [PATCH] ServerConnectRequest#sendFeedback
@ -31,7 +31,7 @@ index c81b0a4e..d21370be 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 35bf4c9f..88e31adb 100644
index 9e933b1d..1a7fa00e 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -268,12 +268,16 @@ public final class UserConnection implements ProxiedPlayer
@ -90,5 +90,5 @@ index 35bf4c9f..88e31adb 100644
}
}
--
2.40.1.windows.1
2.42.0

6
BungeeCord-Patches/0060-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch → BungeeCord-Patches/0059-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch
View File

@ -1,4 +1,4 @@
From 441c10ca0e6b479ad56718e9b17ad6d18f992afc Mon Sep 17 00:00:00 2001
From 49d8d065ef2a1f7a7b885b204ba6676a8f2c826e Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 22 Mar 2022 14:56:44 +0000
Subject: [PATCH] Don't send exceptions to the client during kicks, etc
@ -13,7 +13,7 @@ allows for retaining much of the overall context here, i.e. who
was this exception assocated with?
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 88e31adb..bc0af8a5 100644
index 1a7fa00e..5c4d7e54 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -399,7 +399,8 @@ public final class UserConnection implements ProxiedPlayer
@ -27,5 +27,5 @@ index 88e31adb..bc0af8a5 100644
@Override
--
2.40.1.windows.1
2.42.0

10
BungeeCord-Patches/0061-Improve-login-state-transition.patch → BungeeCord-Patches/0060-Improve-login-state-transition.patch
View File

@ -1,14 +1,14 @@
From e9d0d6cd8b81b710b8c1c5f3e1f54b507363327b Mon Sep 17 00:00:00 2001
From 2444418060a1837f6bffabb0021f73c73403eb9f Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 8 May 2022 12:04:30 +0100
Subject: [PATCH] Improve login state transition
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index e3447ee4..e23d6352 100644
index 9a3c4809..c26f41fb 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -473,6 +473,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -475,6 +475,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
{
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
@ -16,7 +16,7 @@ index e3447ee4..e23d6352 100644
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
// Waterfall start
@@ -527,7 +528,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -529,7 +530,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
}
};
@ -26,5 +26,5 @@ index e3447ee4..e23d6352 100644
}
--
2.40.1.windows.1
2.42.0

8
BungeeCord-Patches/0062-Add-protocol-version-to-packet-not-found-message.patch → BungeeCord-Patches/0061-Add-protocol-version-to-packet-not-found-message.patch
View File

@ -1,4 +1,4 @@
From 9d26478458acb2fb096822ff3a796795ad7fbb39 Mon Sep 17 00:00:00 2001
From 6661c691eb2e99883a2468328adf15e5d2ea87cf Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 12 Jun 2022 06:45:54 +0100
Subject: [PATCH] Add protocol version to packet not found message
@ -6,7 +6,7 @@ Subject: [PATCH] Add protocol version to packet not found message
Also avoids a double get, but, this is probably trivial
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 7e0c4f7a..8bf14d56 100644
index 5eb00df3..dd10c1e1 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
@@ -2,6 +2,8 @@ package net.md_5.bungee.protocol;
@ -18,7 +18,7 @@ index 7e0c4f7a..8bf14d56 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -741,9 +743,12 @@ public enum Protocol
@@ -819,9 +821,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}
@ -34,5 +34,5 @@ index 7e0c4f7a..8bf14d56 100644
}
}
--
2.40.1.windows.1
2.42.0

8
BungeeCord-Patches/0063-Expand-packet-decode-logging-usage.patch → BungeeCord-Patches/0062-Expand-packet-decode-logging-usage.patch
View File

@ -1,14 +1,14 @@
From 046016c634919b94cb990e4aa05e7b9cdc28f54d Mon Sep 17 00:00:00 2001
From b33f4ed8e030c9898156cfeb8db6be204ad4b962 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 19 Jun 2022 10:31:51 +0100
Subject: [PATCH] Expand packet-decode-logging usage
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
index 33494237..29cf4b4f 100644
index fd840d28..053cc9eb 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -142,6 +142,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@@ -152,6 +152,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - read timed out", handler );
} else if ( cause instanceof DecoderException )
{
@ -24,5 +24,5 @@ index 33494237..29cf4b4f 100644
{
ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - corrupted frame: {1}", new Object[]
--
2.40.1.windows.1
2.42.0

8
BungeeCord-Patches/0064-Add-message-for-outdated-clients-that-don-t-support-.patch → BungeeCord-Patches/0063-Add-message-for-outdated-clients-that-don-t-support-.patch
View File

@ -1,4 +1,4 @@
From 64bdfdccac0ae290d6a5767fbdd38f5245750e70 Mon Sep 17 00:00:00 2001
From 7a8edbac1d13abdb7f72ba159cc15808926871dd Mon Sep 17 00:00:00 2001
From: Aurora <aurora@relanet.eu>
Date: Mon, 18 Jul 2022 15:56:05 +0200
Subject: [PATCH] Add message for outdated clients that don't support secure
@ -8,10 +8,10 @@ Clients before 1.19 don't support secure profiles, but since secure profiles is
things checked those outdated clients didn't get a useful message telling them to update.
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index e23d6352..ae842636 100644
index c26f41fb..9b388263 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -396,6 +396,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -398,6 +398,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 )
{
@ -32,5 +32,5 @@ index e42b798b..76ad621f 100644
error_occurred_player=\u00a7cAn error occurred while parsing your message. (Hover for details)
error_occurred_console=\u00a7cAn error occurred while parsing your message: {0}
--
2.40.1.windows.1
2.42.0

10
BungeeCord-Patches/0065-Replace-reflection-inside-netty-with-ChannelFactory.patch → BungeeCord-Patches/0064-Replace-reflection-inside-netty-with-ChannelFactory.patch
View File

@ -1,4 +1,4 @@
From b235367256f401fbc68e02e7d34bb7b568e4751c Mon Sep 17 00:00:00 2001
From 30382255e40088804060b9e07047a89d149ef381 Mon Sep 17 00:00:00 2001
From: Janmm14 <gitconfig1@janmm14.de>
Date: Mon, 21 Jun 2021 23:43:39 +0200
Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
@ -19,10 +19,10 @@ index 3a86fac8..a7091ab6 100644
.childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD )
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
index 634dfca7..394804e8 100644
index 377df7ec..8f531f85 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
@@ -183,7 +183,7 @@ public class BungeeServerInfo implements ServerInfo
@@ -184,7 +184,7 @@ public class BungeeServerInfo implements ServerInfo
}
};
new Bootstrap()
@ -32,7 +32,7 @@ index 634dfca7..394804e8 100644
.handler( PipelineUtils.BASE_SERVERSIDE )
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index bc0af8a5..cf82c182 100644
index 5c4d7e54..7d3f079f 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -384,7 +384,7 @@ public final class UserConnection implements ProxiedPlayer
@ -142,5 +142,5 @@ index af65e192..6a045d16 100644
{
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
--
2.40.1.windows.1
2.42.0

8
BungeeCord-Patches/0066-reduce-log-spam-from-clients-registeirng-too-many-ch.patch → BungeeCord-Patches/0065-reduce-log-spam-from-clients-registeirng-too-many-ch.patch
View File

@ -1,14 +1,14 @@
From 89a9c3c9f0136f173f045385925357b6d9a9bc9b Mon Sep 17 00:00:00 2001
From 4e3af74b4bea1184e7a63dc8f4f6631eecba658b Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 21 Apr 2023 15:32:33 +0100
Subject: [PATCH] reduce log spam from clients registeirng too many channels
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index ae842636..ca0e3764 100644
index 9b388263..395e36b4 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -163,7 +163,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -165,7 +165,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -28,5 +28,5 @@ index ae842636..ca0e3764 100644
@Override
--
2.40.1.windows.1
2.42.0

30
BungeeCord-Patches/0066-fixup-Use-Log4j2-for-logging-and-TerminalConsoleAppe.patch Normal file
View File

@ -0,0 +1,30 @@
From 1665cd2d7da859434abba8d8fd5e7370c98b9150 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 21 Sep 2023 10:51:51 +0100
Subject: [PATCH] fixup! Use Log4j2 for logging and TerminalConsoleAppender for
console
diff --git a/log4j/pom.xml b/log4j/pom.xml
index e83b2f21..6d20191e 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-parent</artifactId>
- <version>1.20-R0.1-SNAPSHOT</version>
+ <version>1.20-R0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-log4j</artifactId>
- <version>1.20-R0.1-SNAPSHOT</version>
+ <version>1.20-R0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Waterfall-Log4J</name>
--
2.42.0

21
BungeeCord-Patches/0067-fixup-Allow-invalid-packet-ids-for-forge-servers.patch Normal file
View File

@ -0,0 +1,21 @@
From 9dc8d90d5610ef148ac47df05d173ae3d749950e Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 21 Sep 2023 10:54:16 +0100
Subject: [PATCH] fixup! Allow invalid packet ids for forge servers
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 7d3f079f..4936001c 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -76,7 +76,6 @@ public final class UserConnection implements ProxiedPlayer
private final ProxyServer bungee;
@Getter
@NonNull
- @Getter
private final ChannelWrapper ch;
@Getter
@NonNull
--
2.42.0

31
BungeeCord-Patches/0068-fixup-Fix-potion-race-condition-on-Forge-1.8.9.patch Normal file
View File

@ -0,0 +1,31 @@
From 658a0d875f9b5dd28a442ae83e42db2cb9456da6 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 21 Sep 2023 11:02:43 +0100
Subject: [PATCH] fixup! Fix potion race condition on Forge 1.8.9
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 485af04f..76acae0e 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -745,7 +745,7 @@ public class DownstreamBridge extends PacketHandler
// Waterfall start
@Override
- public void handle(EntityEffect entityEffect) throws Exception
+ public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception
{
if (con.isDisableEntityMetadataRewrite()) return; // Waterfall
// Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
@@ -757,7 +757,7 @@ public class DownstreamBridge extends PacketHandler
}
@Override
- public void handle(EntityRemoveEffect removeEffect) throws Exception
+ public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
{
if (con.isDisableEntityMetadataRewrite()) return; // Waterfall
con.getPotions().remove(rewriteEntityId(removeEffect.getEntityId()), removeEffect.getEffectId());
--
2.42.0

24
BungeeCord-Patches/0069-fixup-Fix-potion-race-condition-on-Forge-1.8.9.patch Normal file
View File

@ -0,0 +1,24 @@
From 68aa24164c2487820bc4e4dcb14117f62e04c775 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 21 Sep 2023 11:04:15 +0100
Subject: [PATCH] fixup! Fix potion race condition on Forge 1.8.9
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 4936001c..96f4d017 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -127,6 +127,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard();
@Getter
private final Collection<UUID> sentBossBars = new HashSet<>();
+ // Waterfall start
+ @Getter
+ private final Multimap<Integer, Integer> potions = HashMultimap.create();
+ // Waterfall end
@Getter
@Setter
private String lastCommandTabbed;
--
2.42.0

23
BungeeCord-Patches/0070-fixup-Provide-an-option-to-disable-entity-metadata-r.patch Normal file
View File

@ -0,0 +1,23 @@
From 664f46a96cc150e5c1790404ce6f3dce361d355f Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 21 Sep 2023 11:17:49 +0100
Subject: [PATCH] fixup! Provide an option to disable entity metadata rewriting
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 c3268cbe..f9f6d3fc 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -360,7 +360,8 @@ public class ServerConnector extends PacketHandler
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.getDeathLocation(), login.getPortalCooldown() ) );
}
Login modLogin = new Login( login.getEntityId(), login.isHardcore(), 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.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isDebug(), login.isFlat(), login.getDeathLocation(), login.getPortalCooldown() );
+ (byte) user.getPendingConnection().getListener().getTabListSize(), login.getLevelType(), login.getViewDistance(), login.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isLimitedCrafting(), login.isDebug(), login.isFlat(), login.getDeathLocation(),
+ login.getPortalCooldown() );
user.unsafe().sendPacket(modLogin);
// Only send if we're in the same dimension
if ( login.getDimension() == user.getDimension() ) // Waterfall - defer
--
2.42.0

31
BungeeCord-Patches/0071-fixup-Provide-an-option-to-disable-entity-metadata-r.patch Normal file
View File

@ -0,0 +1,31 @@
From e842f41a2be52657911f9a4e35b7a84d9084e92d Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 21 Sep 2023 11:31:06 +0100
Subject: [PATCH] fixup! Provide an option to disable entity metadata rewriting
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 f9f6d3fc..55218447 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -357,7 +357,7 @@ public class ServerConnector extends PacketHandler
// Only send if we are not in the same dimension
if ( login.getDimension() != user.getDimension() ) // Waterfall - defer
{
- 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.getDeathLocation(), login.getPortalCooldown() ) );
+ 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(), (byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
}
Login modLogin = new Login( login.getEntityId(), login.isHardcore(), 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.getSimulationDistance(), login.isReducedDebugInfo(), login.isNormalRespawn(), login.isLimitedCrafting(), login.isDebug(), login.isFlat(), login.getDeathLocation(),
@@ -366,7 +366,7 @@ public class ServerConnector extends PacketHandler
// Only send if we're in the same dimension
if ( login.getDimension() == user.getDimension() ) // Waterfall - defer
{
- 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, login.getDeathLocation(), login.getPortalCooldown() ) );
+ 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(), (byte) 0, login.getDeathLocation(), login.getPortalCooldown() ) );
}
}
// Waterfall end
--
2.42.0