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

Merge branch 'master' into master

This commit is contained in:
Shane Freeder 2024-04-02 18:29:15 +01:00 committed by GitHub
parent df19483568 806c72984f
commit 345ed63096
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
69 changed files with 680 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit a7dbbc2f0a4bc741d695016fc9597d185b965e5d
Subproject commit 84d0ea73fa84b0a60204bd84fb34f75b993c6494

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

@ -1,4 +1,4 @@
From d002f1654018a69fdee68237fff9aa1442363bc2 Mon Sep 17 00:00:00 2001
From be89fec835ee9a14d22f1bb7ae33a36e887258fa 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 30739518..bdccbd78 100644
index 4f520c31..a4ccb90c 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -16,10 +16,9 @@ index 30739518..bdccbd78 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.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -27,7 +26,7 @@ index 30739518..bdccbd78 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -68,7 +67,7 @@ index 30739518..bdccbd78 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index b10e7a38..07d49112 100644
index 4dbf5e29..15546f07 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -79,7 +78,7 @@ index b10e7a38..07d49112 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -87,7 +86,7 @@ index b10e7a38..07d49112 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -146,7 +145,7 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index 87c2beb1..2aa2ad55 100644
index 4239d5a1..3cfa8ac3 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,19 +4,19 @@
@ -157,7 +156,7 @@ index 87c2beb1..2aa2ad55 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -165,7 +164,7 @@ index 87c2beb1..2aa2ad55 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -176,7 +175,7 @@ index 87c2beb1..2aa2ad55 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 06d2e13b..058e6fa8 100644
index e7a474c6..13b2481d 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -187,7 +186,7 @@ index 06d2e13b..058e6fa8 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -195,7 +194,7 @@ index 06d2e13b..058e6fa8 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -206,7 +205,7 @@ index 06d2e13b..058e6fa8 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 13e71066..316f1e35 100644
index 1f36ab90..120d21b2 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -217,7 +216,7 @@ index 13e71066..316f1e35 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -225,7 +224,7 @@ index 13e71066..316f1e35 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -234,7 +233,7 @@ index 13e71066..316f1e35 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 47eb961c..9ee30d66 100644
index 1e2f2e96..09b75466 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -245,7 +244,7 @@ index 47eb961c..9ee30d66 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -253,7 +252,7 @@ index 47eb961c..9ee30d66 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -275,7 +274,7 @@ index 47eb961c..9ee30d66 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index e63a1dfb..2016f6a1 100644
index 62e1f137..095368b4 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -286,7 +285,7 @@ index e63a1dfb..2016f6a1 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -294,11 +293,11 @@ index e63a1dfb..2016f6a1 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 60b69834..7371de6a 100644
index 5ca1b4c3..6bf9bdcf 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -309,7 +308,7 @@ index 60b69834..7371de6a 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -317,11 +316,11 @@ index 60b69834..7371de6a 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml
index 822babc6..9fac0511 100644
index 2a498c05..5e5cab83 100644
--- a/module/cmd-kick/pom.xml
+++ b/module/cmd-kick/pom.xml
@@ -4,14 +4,14 @@
@ -332,7 +331,7 @@ index 822babc6..9fac0511 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -340,11 +339,11 @@ index 822babc6..9fac0511 100644
- <artifactId>bungeecord-module-cmd-kick</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-kick</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index ba861252..d7324d89 100644
index 99090af7..670a55f4 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -355,7 +354,7 @@ index ba861252..d7324d89 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -363,11 +362,11 @@ index ba861252..d7324d89 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 1a62e71d..00539f37 100644
index 5aee8173..6c65d8f4 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -378,7 +377,7 @@ index 1a62e71d..00539f37 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -386,11 +385,11 @@ index 1a62e71d..00539f37 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index 57cbf1e9..6785f2a0 100644
index d33200e2..dc3af35e 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -401,7 +400,7 @@ index 57cbf1e9..6785f2a0 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -409,11 +408,11 @@ index 57cbf1e9..6785f2a0 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index b1fd5afd..d78c9a25 100644
index 21ba8f2b..baa24b7d 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -424,7 +423,7 @@ index b1fd5afd..d78c9a25 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -432,7 +431,7 @@ index b1fd5afd..d78c9a25 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -462,7 +461,7 @@ index b1fd5afd..d78c9a25 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index cf663eec..a426476d 100644
index e3a077f3..7d8cf5c4 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@ -473,7 +472,7 @@ index cf663eec..a426476d 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -481,11 +480,11 @@ index cf663eec..a426476d 100644
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index a4265e54..5e9d29d7 100644
index 56d505ab..f7bae2fe 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -496,7 +495,7 @@ index a4265e54..5e9d29d7 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -504,7 +503,7 @@ index a4265e54..5e9d29d7 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -515,25 +514,18 @@ index a4265e54..5e9d29d7 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index ed3c1a87..a6684b7c 100644
index 5d52cc90..87ab1b76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@@ -3,18 +3,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+ <parent>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-super</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -552,7 +544,7 @@ index ed3c1a87..a6684b7c 100644
</organization>
<licenses>
<license>
@@ -26,7 +33,19 @@
@@ -26,7 +26,19 @@
<developers>
<developer>
@ -573,7 +565,7 @@ index ed3c1a87..a6684b7c 100644
</developer>
</developers>
@@ -46,28 +65,24 @@
@@ -46,28 +58,24 @@
</modules>
<scm>
@ -612,7 +604,7 @@ index ed3c1a87..a6684b7c 100644
</distributionManagement>
<properties>
@@ -143,12 +158,21 @@
@@ -149,12 +157,21 @@
</execution>
</executions>
</plugin>
@ -620,7 +612,7 @@ index ed3c1a87..a6684b7c 100644
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
</plugin>
<plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
@ -633,8 +625,8 @@ index ed3c1a87..a6684b7c 100644
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.0</version>
@@ -173,6 +197,7 @@
<version>3.3.1</version>
@@ -179,6 +196,7 @@
</dependency>
</dependencies>
</plugin>
@ -642,7 +634,7 @@ index ed3c1a87..a6684b7c 100644
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -285,6 +310,15 @@
@@ -291,6 +309,15 @@
</goals>
</execution>
</executions>
@ -658,7 +650,7 @@ index ed3c1a87..a6684b7c 100644
</plugin>
<plugin>
<groupId>org.projectlombok</groupId>
@@ -333,6 +367,7 @@
@@ -339,6 +366,7 @@
<!-- lombok does not add @return or @param which causes warnings, so ignore -->
<doclint>none</doclint>
<sourcepath>${project.build.directory}/delombok</sourcepath>
@ -667,7 +659,7 @@ index ed3c1a87..a6684b7c 100644
</execution>
</executions>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index f1c169a9..12096614 100644
index 6f5acbc2..db62c340 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -678,7 +670,7 @@ index f1c169a9..12096614 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -686,7 +678,7 @@ index f1c169a9..12096614 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -694,9 +686,9 @@ index f1c169a9..12096614 100644
+ <name>Waterfall-Protocol</name>
+ <description>Minimal implementation of the Minecraft protocol for use in Waterfall</description>
<!-- We really shouldn't depend on external repositories, but at least this is the Central staging one -->
<!-- We really shouldn't depend on external repositories -->
<repositories>
@@ -41,8 +41,8 @@
@@ -35,8 +35,8 @@
<scope>compile</scope>
</dependency>
<dependency>
@ -708,7 +700,7 @@ index f1c169a9..12096614 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 335ee3d5..5558adfb 100644
index cd90feeb..d8aae8fa 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -719,7 +711,7 @@ index 335ee3d5..5558adfb 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -727,7 +719,7 @@ index 335ee3d5..5558adfb 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -787,7 +779,7 @@ index 335ee3d5..5558adfb 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index edd3e11a..4e9bd6cc 100644
index e07828dd..4b6fdfc2 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -798,7 +790,7 @@ index edd3e11a..4e9bd6cc 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -806,7 +798,7 @@ index edd3e11a..4e9bd6cc 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -828,7 +820,7 @@ index edd3e11a..4e9bd6cc 100644
<scope>compile</scope>
</dependency>
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
index acb5201f..b7529bf3 100644
index 3b944b85..1b61e3ad 100644
--- a/slf4j/pom.xml
+++ b/slf4j/pom.xml
@@ -4,18 +4,18 @@
@ -837,10 +829,9 @@ index acb5201f..b7529bf3 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-super</artifactId>
+ <version>dev-SNAPSHOT</version>
+ <artifactId>waterfall-parent</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -848,7 +839,7 @@ index acb5201f..b7529bf3 100644
- <artifactId>bungeecord-slf4j</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-slf4j</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-SLF4J</name>
@ -857,5 +848,5 @@ index acb5201f..b7529bf3 100644
<properties>
--
2.42.0
2.44.0

6
BungeeCord-Patches/0002-Copy-license-files-into-jar.patch
View File

@ -1,11 +1,11 @@
From f090bbf4ac1184c000210d21a7485c3cb7f24b13 Mon Sep 17 00:00:00 2001
From 42086afe5cb8e7ec279421c3caf74fdf0ebbc413 Mon Sep 17 00:00:00 2001
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
Date: Wed, 18 Jul 2018 20:23:03 +0300
Subject: [PATCH] Copy license files into jar
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 5135c0fd..233c6aae 100644
index d1c4570d..fe1506e4 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -119,4 +119,26 @@
@ -36,5 +36,5 @@ index 5135c0fd..233c6aae 100644
+ <!-- Waterfall end -->
</project>
--
2.17.2 (Apple Git-113)
2.43.0

12
BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch
View File

@ -1,4 +1,4 @@
From 9ec33f3c55ffd519b35f4a5a822db2e8d993a620 Mon Sep 17 00:00:00 2001
From ec9212b56121afd790778af8dc277c5bdf8d1832 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:28:45 -0700
Subject: [PATCH] Rename references from BungeeCord to Waterfall
@ -18,10 +18,10 @@ index f1ccd4f6..d703d6d2 100644
}
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 c2fe9a40..e3065f12 100644
index e7f3f09a..0bf89f1c 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -189,7 +189,7 @@ public class BungeeCord extends ProxyServer
@@ -192,7 +192,7 @@ public class BungeeCord extends ProxyServer
public BungeeCord() throws IOException
{
// Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
@ -30,7 +30,7 @@ index c2fe9a40..e3065f12 100644
reloadMessages();
@@ -538,7 +538,7 @@ public class BungeeCord extends ProxyServer
@@ -541,7 +541,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getName()
{
@ -88,7 +88,7 @@ index efe048c9..720d0c3b 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
index 150d8739..8ae799c1 100644
index de85f0b2..b9e99d6c 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
@@ -216,7 +216,7 @@ public class YamlConfig implements ConfigurationAdapter
@ -101,5 +101,5 @@ index 150d8739..8ae799c1 100644
SocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2.38.1
2.43.0

12
BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch
View File

@ -1,4 +1,4 @@
From ece5cfccb9506cc13bb552613cc9424afff3ae51 Mon Sep 17 00:00:00 2001
From 6ddae20ccb4b7b035ac3b24464671daa01a57056 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 25 Oct 2016 11:58:37 -0400
Subject: [PATCH] Add Waterfall configuration files
@ -42,10 +42,10 @@ index 00000000..741ebfde
+
+}
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 e3065f12..f1ddb4d0 100644
index 0bf89f1c..3aae1ea4 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -10,6 +10,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -9,6 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@ -53,7 +53,7 @@ index e3065f12..f1ddb4d0 100644
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
@@ -114,7 +115,7 @@ public class BungeeCord extends ProxyServer
@@ -116,7 +117,7 @@ public class BungeeCord extends ProxyServer
* Configuration.
*/
@Getter
@ -76,7 +76,7 @@ index 54c3223c..54a6cb38 100644
/**
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
index 8ae799c1..0dd69778 100644
index b9e99d6c..f6b5e8b8 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
@@ -47,10 +47,15 @@ public class YamlConfig implements ConfigurationAdapter
@ -118,5 +118,5 @@ index 8ae799c1..0dd69778 100644
if ( permissions == null )
{
--
2.38.1
2.43.0

12
BungeeCord-Patches/0005-Disable-Metrics.patch
View File

@ -1,4 +1,4 @@
From d5aef08f1513e5e51b92d60e10e528d7b82ad40d Mon Sep 17 00:00:00 2001
From e79d3a76afb72b8aad4063923f0748177a4956ce Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Disable Metrics
@ -6,10 +6,10 @@ Subject: [PATCH] Disable Metrics
MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
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 f1ddb4d0..ffff990a 100644
index 3aae1ea4..a64d916a 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -125,7 +125,7 @@ public class BungeeCord extends ProxyServer
@@ -127,7 +127,7 @@ public class BungeeCord extends ProxyServer
* locations.yml save thread.
*/
private final Timer saveThread = new Timer( "Reconnect Saver" );
@ -18,7 +18,7 @@ index f1ddb4d0..ffff990a 100644
/**
* Server socket listener.
*/
@@ -312,7 +312,7 @@ public class BungeeCord extends ProxyServer
@@ -315,7 +315,7 @@ public class BungeeCord extends ProxyServer
}
}
}, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@ -27,7 +27,7 @@ index f1ddb4d0..ffff990a 100644
Runtime.getRuntime().addShutdownHook( new Thread()
{
@@ -470,7 +470,7 @@ public class BungeeCord extends ProxyServer
@@ -473,7 +473,7 @@ public class BungeeCord extends ProxyServer
reconnectHandler.close();
}
saveThread.cancel();
@ -177,5 +177,5 @@ index eabf7573..00000000
- }
-}
--
2.38.1
2.43.0

4
BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch
View File

@ -1,4 +1,4 @@
From 1345e92a500c226958f02eb98417b117e6605371 Mon Sep 17 00:00:00 2001
From f2f55cb7743a44bc8d0db757315cbfab4d43f22f Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:34:52 -0700
Subject: [PATCH] Fetch modules from the Waterfall API endpoint
@ -47,5 +47,5 @@ index 2536435c..5bb86152 100644
} catch ( IOException ex )
{
--
2.37.2.windows.2
2.43.0

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

@ -1,14 +1,14 @@
From d86bb6401198008a6cc41ab73ebd1f253322ff7c Mon Sep 17 00:00:00 2001
From a7831360e8f8300b9aa7d3f340b609991a8f6150 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 7d5e2635..a0dd9be6 100644
index fdfa1480..e158a2d3 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
@@ -114,6 +114,16 @@ public class ProtocolConstants
@@ -117,6 +117,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}
@ -26,5 +26,5 @@ index 7d5e2635..a0dd9be6 100644
{
--
2.42.0
2.43.0.windows.1

6
BungeeCord-Patches/0008-Presize-the-HTTP-response-buffer.patch
View File

@ -1,4 +1,4 @@
From 0cf87c789c24e97cbadb74d50597c15d85006b26 Mon Sep 17 00:00:00 2001
From 4632030b32001c18b65c883cab0de4f3688ed5c1 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 13 Apr 2016 15:17:05 -0400
Subject: [PATCH] Presize the HTTP response buffer
@ -6,7 +6,7 @@ Subject: [PATCH] Presize the HTTP response buffer
16 characters is extremely small, and all responses start around 256 bytes. 640 characters seems to be good (covering skins and capes), based on sampling profile API responses.
diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
index 596ced71..b91981e6 100644
index a1e59b47..e2911d5e 100644
--- a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
@@ -16,7 +16,7 @@ public class HttpHandler extends SimpleChannelInboundHandler<HttpObject>
@ -19,5 +19,5 @@ index 596ced71..b91981e6 100644
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
--
2.30.1 (Apple Git-130)
2.43.0

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

@ -1,4 +1,4 @@
From 8c8b25883c768d798456d7289d057275d790b677 Mon Sep 17 00:00:00 2001
From 0cdb5fce7e1e629416846d4493d8eee5458b1263 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,10 +43,10 @@ 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 409464d2..76db3a71 100644
index 47e06dcd..c60c7dd7 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -265,7 +265,7 @@ public class ServerConnector extends PacketHandler
@@ -277,7 +277,7 @@ public class ServerConnector extends PacketHandler
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@ -56,10 +56,10 @@ index 409464d2..76db3a71 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 117ebb76..b8248ec4 100644
index 27737d1b..b7856d92 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
@@ -300,7 +300,7 @@ public class DownstreamBridge extends PacketHandler
@@ -313,7 +313,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.42.0
2.43.0.windows.1

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

@ -1,4 +1,4 @@
From f2c91fe1c64c1b9d468063c57165a808be7235e1 Mon Sep 17 00:00:00 2001
From 3916ceec65caec4aaa4f049a5477856ccb69274a 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
@ -237,7 +237,7 @@ index 6352951c..91efc0a6 100644
/**
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
index 88d36ad2..fc92a7b5 100644
index e582808f..29cd91dd 100644
--- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java
+++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
@@ -74,7 +74,7 @@ public class ServerPing
@ -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 09080f36..14a34f99 100644
index d9247fb2..43fb3208 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
@@ -722,7 +722,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -788,7 +788,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
@ -263,5 +263,5 @@ index 09080f36..14a34f99 100644
@Override
--
2.42.0
2.43.0.windows.1

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

@ -1,4 +1,4 @@
From 0a7710b54fbc938b1913070090ebeb7b6e3bdd5f Mon Sep 17 00:00:00 2001
From 5dc2020c97ea49af439b9277813faed5aea6eb52 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 76db3a71..3aacebe1 100644
index c60c7dd7..3bc72011 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 76db3a71..3aacebe1 100644
import java.util.Queue;
import java.util.Set;
import java.util.UUID;
@@ -109,15 +110,39 @@ public class ServerConnector extends PacketHandler
@@ -115,15 +116,39 @@ public class ServerConnector extends PacketHandler
String newHost = copiedHandshake.getHost() + "\00" + AddressUtil.sanitizeAddress( user.getAddress() ) + "\00" + user.getUUID();
LoginResult profile = user.getPendingConnection().getLoginProfile();
@ -67,23 +67,24 @@ index 76db3a71..3aacebe1 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 be65c3ad..6ca259cb 100644
index 9edec410..c8d5648c 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -170,8 +170,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -173,9 +173,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this );
+ // No-config FML handshake marker.
// Set whether the connection has a 1.8 FML marker in the handshake.
- forgeClientHandler.setFmlTokenInHandshake( this.getPendingConnection().getExtraDataInHandshake().contains( ForgeConstants.FML_HANDSHAKE_TOKEN ) );
-
+ if (this.getPendingConnection().getExtraDataInHandshake().contains( ForgeConstants.FML_HANDSHAKE_TOKEN ))
+ {
+ forgeClientHandler.setFmlTokenInHandshake( true );
+ }
return BungeeCord.getInstance().addConnection( this );
}
public void sendPacket(PacketWrapper packet)
diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java
index 6dca2048..f5253b89 100644
--- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java
@ -100,5 +101,5 @@ index 6dca2048..f5253b89 100644
* The FML 1.8 handshake token.
*/
--
2.42.0
2.43.0.windows.1

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

@ -1,14 +1,14 @@
From c11014146824ca18446e6175026a088ca23a3369 Mon Sep 17 00:00:00 2001
From 455892a5aa7454f2c3e2fe8b8f6e6d0c6ad71c5d 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 1273e098..2907630d 100644
index 7e14484b..3698762c 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
@@ -666,6 +666,26 @@ public class ComponentsTest
@@ -696,6 +696,26 @@ public class ComponentsTest
assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
}
@ -36,12 +36,12 @@ index 1273e098..2907630d 100644
public void testLoopSimple()
{
diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
index 9ec5dcb1..e56c8353 100644
index 47c06baa..2552a34f 100644
--- a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
+++ b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
@@ -25,4 +25,12 @@ public class TranslatableComponentTest
assertEquals( "Test string with a placeholder", TextComponent.toPlainText( baseComponents ) );
assertEquals( "§fTest string with §fa§f placeholder", TextComponent.toLegacyText( baseComponents ) );
assertEquals( "Test string with a placeholder", BaseComponent.toPlainText( baseComponents ) );
assertEquals( "§fTest string with §fa§f placeholder", BaseComponent.toLegacyText( baseComponents ) );
}
+
+ @Test
@ -53,5 +53,5 @@ index 9ec5dcb1..e56c8353 100644
+ }
}
--
2.34.1
2.44.0

8
BungeeCord-Patches/0013-Allow-removing-servers-or-changing-addresses-on-relo.patch
View File

@ -1,4 +1,4 @@
From a761cca9133852a90022b32fa030a8c54da035a7 Mon Sep 17 00:00:00 2001
From 9a24ff623c14bd07b709f8620d978d6432d9048a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 28 Jan 2016 15:13:29 -0700
Subject: [PATCH] Allow removing servers or changing addresses on reload
@ -10,7 +10,7 @@ Kicks players on failure to move.
Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 54a6cb38..ecd3b619 100644
index 1a688179..fea0ec61 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -11,12 +11,15 @@ import java.util.UUID;
@ -29,7 +29,7 @@ index 54a6cb38..ecd3b619 100644
import net.md_5.bungee.util.CaseInsensitiveMap;
import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -116,20 +119,38 @@ public abstract class Configuration implements ProxyConfig
@@ -118,20 +121,38 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{
@ -79,5 +79,5 @@ index 54a6cb38..ecd3b619 100644
for ( ListenerInfo listener : listeners )
--
2.35.3
2.43.0.windows.1

4
BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch
View File

@ -1,4 +1,4 @@
From 209fd1c50168f4b5d5db23d0cdd7aef25366d79b Mon Sep 17 00:00:00 2001
From 191e3b8b67359f39bac4d62ee57796eb1e793ce3 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Sun, 24 Jan 2016 15:13:29 -0700
Subject: [PATCH] Enable TCP_NODELAY.
@ -18,5 +18,5 @@ index 2d6885a9..3f30da0c 100644
ch.config().setWriteBufferWaterMark( MARK );
--
2.40.0
2.43.0

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

@ -1,4 +1,4 @@
From 899f2a62a91d604866e2a5a85378b2fe9bc30aa0 Mon Sep 17 00:00:00 2001
From 87cb9413787e84d11886b19ed594167c8138e688 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 b8248ec4..23e7b6d8 100644
index b7856d92..61ce9ed6 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
@@ -282,7 +282,6 @@ public class DownstreamBridge extends PacketHandler
@@ -295,7 +295,6 @@ public class DownstreamBridge extends PacketHandler
@SuppressWarnings("checkstyle:avoidnestedblocks")
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -19,7 +19,7 @@ index b8248ec4..23e7b6d8 100644
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -309,6 +308,7 @@ public class DownstreamBridge extends PacketHandler
@@ -322,6 +321,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{
@ -28,5 +28,5 @@ index b8248ec4..23e7b6d8 100644
String subChannel = in.readUTF();
--
2.42.0
2.43.0

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

@ -1,4 +1,4 @@
From ff46baa5671121531007c00dc684dc035a16dd8c Mon Sep 17 00:00:00 2001
From 702afc4df45926f3d96841ffb908f3b85cb2d3f0 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,7 +9,7 @@ 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 482341ef..76a3ddd0 100644
index d79d5e5c..250e7620 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
@@ -18,6 +18,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -35,12 +35,12 @@ index 482341ef..76a3ddd0 100644
+ DefinedPacket packet = prot.createPacket( packetId, protocolVersion, supportsForge );
if ( packet != null )
{
packet.read( in, prot.getDirection(), protocolVersion );
packet.read( in, protocol, 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 b6985fee..7f001b11 100644
index cb5c30d5..a8a91955 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
@@ -749,14 +749,23 @@ public enum Protocol
@@ -861,14 +861,23 @@ public enum Protocol
return protocol;
}
@ -66,37 +66,27 @@ index b6985fee..7f001b11 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 3aacebe1..a5c8de90 100644
index 37f86325..1b7395ad 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;
import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.netty.PacketHandler;
+import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.MinecraftDecoder;
import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.ProtocolConstants;
@@ -222,6 +224,12 @@ public class ServerConnector extends PacketHandler
@@ -234,6 +234,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()) {
+ ((MinecraftDecoder) server.getCh().getHandle().pipeline().get(PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
+ ((MinecraftDecoder) user.getCh().getHandle().pipeline().get(PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
+ ((net.md_5.bungee.protocol.MinecraftDecoder) server.getCh().getHandle().pipeline().get(net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
+ ((net.md_5.bungee.protocol.MinecraftDecoder) user.getCh().getHandle().pipeline().get(net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
+ }
+
bungee.getPluginManager().callEvent( event );
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
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 30cc36a4..c033118f 100644
index 2bf92a03..ccebe19f 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
@@ -338,6 +338,12 @@ public abstract class EntityMap
@@ -342,6 +342,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex;
@ -110,5 +100,5 @@ index 30cc36a4..c033118f 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From a5ce9cf6ba775ef5163c65cd7f1bafd6cc4ba1d1 Mon Sep 17 00:00:00 2001
From 5343292903efcc962a2a510267018bb5872c3995 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 3c312589..d8c1c040 100644
index f80515d4..050cc29b 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
@@ -49,6 +49,8 @@ public class UpstreamBridge extends PacketHandler
@@ -51,6 +51,8 @@ public class UpstreamBridge extends PacketHandler
private final ProxyServer bungee;
private final UserConnection con;
@ -85,7 +85,7 @@ index 3c312589..d8c1c040 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -223,6 +225,20 @@ public class UpstreamBridge extends PacketHandler
@@ -230,6 +232,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{
@ -107,5 +107,5 @@ index 3c312589..d8c1c040 100644
boolean isRegisteredCommand = false;
boolean isCommand = tabComplete.getCursor().startsWith( "/" );
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From e8ea9698ec9af3d3ccc6be444b8a604aae29041a Mon Sep 17 00:00:00 2001
From f3c9d4d4def15946b7de244db86dd3d41e6b8c00 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 a5c8de90..59403052 100644
index 1b7395ad..e670a57a 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -499,6 +499,6 @@ public class ServerConnector extends PacketHandler
@@ -522,6 +522,6 @@ public class ServerConnector extends PacketHandler
@Override
public String toString()
{
@ -19,10 +19,10 @@ index a5c8de90..59403052 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 23e7b6d8..88b0156c 100644
index d408840d..cd3ed518 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
@@ -774,6 +774,6 @@ public class DownstreamBridge extends PacketHandler
@@ -790,6 +790,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -31,10 +31,10 @@ index 23e7b6d8..88b0156c 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 14a34f99..7e2d0c63 100644
index 43fb3208..4325fe23 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
@@ -728,20 +728,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -794,20 +794,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{
@ -57,10 +57,10 @@ index 14a34f99..7e2d0c63 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 4a561406..14fac032 100644
index 050cc29b..740c90ec 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
@@ -383,6 +383,6 @@ public class UpstreamBridge extends PacketHandler
@@ -396,6 +396,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -69,5 +69,5 @@ index 4a561406..14fac032 100644
}
}
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 1b52a13e4834482bb8b9daa3e54556fc2e612668 Mon Sep 17 00:00:00 2001
From 10ab9f8cff10028bd518507ce3a122897f32d202 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 7e2d0c63..9fd951be 100644
index 4325fe23..b7dd5fe3 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
@@ -301,10 +301,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -323,10 +323,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING;
}
@ -29,5 +29,5 @@ index 7e2d0c63..9fd951be 100644
disconnect( "" );
}
--
2.42.0
2.43.0.windows.1

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

@ -1,4 +1,4 @@
From 1e597d86bd5b0bb1fbd197fdc904097e6e96012f Mon Sep 17 00:00:00 2001
From 092cd796c78358364ed05ae54e4b3c875879393f 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,10 +8,10 @@ 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 b09afd88..93a96bfd 100644
index a64d916a..3501a4e9 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
@@ -122,7 +122,7 @@ public class BungeeCord extends ProxyServer
* Localization formats.
*/
private Map<String, Format> messageFormats;
@ -20,7 +20,7 @@ index b09afd88..93a96bfd 100644
/**
* locations.yml save thread.
*/
@@ -270,7 +270,8 @@ public class BungeeCord extends ProxyServer
@@ -273,7 +273,8 @@ public class BungeeCord extends ProxyServer
ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
}
@ -30,7 +30,7 @@ index b09afd88..93a96bfd 100644
File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory );
@@ -359,7 +360,7 @@ public class BungeeCord extends ProxyServer
@@ -362,7 +363,7 @@ public class BungeeCord extends ProxyServer
.option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
.childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD )
@ -39,7 +39,7 @@ index b09afd88..93a96bfd 100644
.localAddress( info.getSocketAddress() )
.bind().addListener( listener );
@@ -382,7 +383,7 @@ public class BungeeCord extends ProxyServer
@@ -385,7 +386,7 @@ public class BungeeCord extends ProxyServer
}
}
};
@ -48,7 +48,7 @@ index b09afd88..93a96bfd 100644
}
}
}
@@ -491,12 +492,14 @@ public class BungeeCord extends ProxyServer
@@ -494,12 +495,14 @@ public class BungeeCord extends ProxyServer
}
getLogger().info( "Closing IO threads" );
@ -83,5 +83,5 @@ index 671cf96f..377df7ec 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() )
.remoteAddress( socketAddress )
--
2.42.0
2.43.0

4
BungeeCord-Patches/0021-Better-Decompression-Sanity.patch
View File

@ -1,4 +1,4 @@
From b34e416dfd250b7d97c1ad1c810016203d9e53ab Mon Sep 17 00:00:00 2001
From 248079a510a933343b7f52004e87a7c38170a5ed 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
@ -58,5 +58,5 @@ index e8d5ed19..00e03bae 100644
if ( compressionThreshold < 0 )
{
--
2.34.1
2.43.0

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

@ -1,4 +1,4 @@
From 5db60dbe715d4f186caee02e5cbbba4df5b23d90 Mon Sep 17 00:00:00 2001
From 578c03f455937272ca3acd2a7dac0bdbbd125412 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.
@ -170,10 +170,10 @@ index 59c104d3..698b420f 100644
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
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 93a96bfd..5af9c3bb 100644
index 3501a4e9..5a3acccf 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -664,10 +664,18 @@ public class BungeeCord extends ProxyServer
@@ -667,10 +667,18 @@ public class BungeeCord extends ProxyServer
return config.getServers();
}
@ -194,7 +194,7 @@ index 93a96bfd..5af9c3bb 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index ecd3b619..7094fe0b 100644
index fea0ec61..37abb3c4 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -1,6 +1,7 @@
@ -221,15 +221,15 @@ index ecd3b619..7094fe0b 100644
/**
* Set of all servers.
*/
@@ -72,6 +75,7 @@ public abstract class Configuration implements ProxyConfig
private boolean preventProxyConnections;
@@ -73,6 +76,7 @@ public abstract class Configuration implements ProxyConfig
private boolean forgeSupport;
private boolean rejectTransfers;
+ @Synchronized("serversLock") // Waterfall
public void load()
{
ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter();
@@ -119,7 +123,7 @@ public abstract class Configuration implements ProxyConfig
@@ -121,7 +125,7 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{
@ -238,7 +238,7 @@ index ecd3b619..7094fe0b 100644
for ( ServerInfo oldServer : oldServers.values() )
{
@@ -182,4 +186,71 @@ public abstract class Configuration implements ProxyConfig
@@ -184,4 +188,71 @@ public abstract class Configuration implements ProxyConfig
{
return favicon;
}
@ -311,5 +311,5 @@ index ecd3b619..7094fe0b 100644
+ // Waterfall end
}
--
2.42.0
2.44.0

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

@ -1,36 +0,0 @@
From aa9261c4f9c7cac4124d7c144038b033952b3503 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 045e9545..212cdbf2 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
@@ -200,6 +200,7 @@ public class UpstreamBridge extends PacketHandler
private String handleChat(String message)
{
+ boolean empty = true;
for ( int index = 0, length = message.length(); index < length; index++ )
{
char c = message.charAt( index );
@@ -207,8 +208,14 @@ public class UpstreamBridge extends PacketHandler
{
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
throw CancelSendSignal.INSTANCE;
+ } else if (empty && !Character.isWhitespace(c)) {
+ empty = false;
}
}
+ if (empty) {
+ con.disconnect("Chat message is empty");
+ throw CancelSendSignal.INSTANCE;
+ }
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
--
2.42.0

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

@ -1,4 +1,4 @@
From 3dfc4797edcf7a603aa3e0c630cb5f8adacccbdf Mon Sep 17 00:00:00 2001
From 8808208cba06c28cb25e93de6752e7a0fea63094 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.42.0
2.44.0

65
BungeeCord-Patches/0025-Improve-ServerKickEvent.patch → BungeeCord-Patches/0024-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From e5c22d17359ad3da880b5ae4d656b707ad0f73d3 Mon Sep 17 00:00:00 2001
From c948a81d4f6604ea281baa2f9a96ac9366ea9e44 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
@ -6,7 +6,7 @@ Subject: [PATCH] Improve ServerKickEvent
ServerKickEvent traditionally will only fire if the server sends a kick packet. During a server shutdown, or server crash this event would not fire for most players. While ServerDisconnectEvent is fired it does not tell us if it was a kick/shutdown/server crash. This improvement fires the ServerKickEvent for server caused disconnections, and adds a Cause to the kick event.
diff --git a/api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java b/api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java
index 0e1ef5c4..ee63732d 100644
index 3f9efaa8..5d2597ad 100644
--- a/api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java
+++ b/api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java
@@ -44,6 +44,12 @@ public class ServerKickEvent extends Event implements Cancellable
@ -22,14 +22,13 @@ index 0e1ef5c4..ee63732d 100644
public enum State
{
@@ -51,6 +57,14 @@ public class ServerKickEvent extends Event implements Cancellable
@@ -51,6 +57,13 @@ public class ServerKickEvent extends Event implements Cancellable
CONNECTING, CONNECTED, UNKNOWN;
}
+ // Waterfall start
+ public enum Cause
+ {
+
+ SERVER, LOST_CONNECTION, EXCEPTION, UNKNOWN;
+ }
+ // Waterfall end
@ -37,48 +36,55 @@ index 0e1ef5c4..ee63732d 100644
@Deprecated
public ServerKickEvent(ProxiedPlayer player, BaseComponent[] kickReasonComponent, ServerInfo cancelServer)
{
@@ -63,14 +77,23 @@ public class ServerKickEvent extends Event implements Cancellable
this( player, player.getServer().getInfo(), kickReasonComponent, cancelServer, state );
@@ -69,14 +82,29 @@ public class ServerKickEvent extends Event implements Cancellable
this( player, kickedFrom, TextComponent.fromArray( kickReasonComponent ), cancelServer, state );
}
- public ServerKickEvent(ProxiedPlayer player, ServerInfo kickedFrom, BaseComponent reason, ServerInfo cancelServer, State state)
+ // Waterfall start
+
+ @Deprecated
public ServerKickEvent(ProxiedPlayer player, ServerInfo kickedFrom, BaseComponent[] kickReasonComponent, ServerInfo cancelServer, State state)
+ public ServerKickEvent(ProxiedPlayer player, ServerInfo kickedFrom, BaseComponent kickReasonComponent, ServerInfo cancelServer, State state)
+ {
+ this( player, kickedFrom, kickReasonComponent, cancelServer, state, Cause.UNKNOWN );
+ this(player, kickedFrom, kickReasonComponent, cancelServer, state, Cause.UNKNOWN);
+ }
+
+ public ServerKickEvent(ProxiedPlayer player, ServerInfo kickedFrom, BaseComponent[] kickReasonComponent, ServerInfo cancelServer, State state, Cause cause)
+ public ServerKickEvent(ProxiedPlayer player, ServerInfo kickedFrom, BaseComponent[] reason, ServerInfo cancelServer, State state, Cause cause)
+ {
+ this(player, kickedFrom, TextComponent.fromArray(reason), cancelServer, state, cause);
+ }
+
+ public ServerKickEvent(ProxiedPlayer player, ServerInfo kickedFrom, BaseComponent reason, ServerInfo cancelServer, State state, Cause cause)
{
this.player = player;
this.kickedFrom = kickedFrom;
this.kickReasonComponent = kickReasonComponent;
this.reason = reason;
this.cancelServer = cancelServer;
this.state = state;
+ this.cause = cause;
}
+ // Waterfall end
@Deprecated
public String getKickReason()
/**
* @return the kick reason
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 59403052..f981313e 100644
index e670a57a..307a417b 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -416,7 +416,7 @@ public class ServerConnector extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = user.updateAndGetNextServer( target );
- ServerKickEvent event = new ServerKickEvent( user, target, ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTING );
+ ServerKickEvent event = new ServerKickEvent( user, target, ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTING, ServerKickEvent.Cause.SERVER ); // Waterfall
@@ -439,7 +439,7 @@ public class ServerConnector extends PacketHandler
ServerKickEvent event = new ServerKickEvent( user, target, new BaseComponent[]
{
kick.getMessage()
- }, def, ServerKickEvent.State.CONNECTING );
+ }, def, ServerKickEvent.State.CONNECTING, ServerKickEvent.Cause.SERVER ); // Waterfall );
if ( event.getKickReason().toLowerCase( Locale.ROOT ).contains( "outdated" ) && def != null )
{
// 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 88b0156c..30fbb0b1 100644
index cd3ed518..d4036c5d 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
@@ -97,16 +97,19 @@ public class DownstreamBridge extends PacketHandler
@@ -98,16 +98,19 @@ public class DownstreamBridge extends PacketHandler
return;
}
@ -97,13 +103,13 @@ index 88b0156c..30fbb0b1 100644
+ else
{
- con.disconnect( Util.exception( t ) );
+ con.disconnect0( event.getKickReasonComponent() );
+ con.disconnect0( event.getReason() );
}
+ // Waterfall end
}
@Override
@@ -121,7 +124,19 @@ public class DownstreamBridge extends PacketHandler
@@ -122,7 +125,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() )
{
@ -118,25 +124,28 @@ index 88b0156c..30fbb0b1 100644
+ }
+ else
+ {
+ con.disconnect0( event.getKickReasonComponent() );
+ con.disconnect0( event.getReason() );
+ }
+ // Waterfall end
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -620,7 +635,11 @@ public class DownstreamBridge extends PacketHandler
@@ -633,10 +648,14 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
- ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTED ) );
+ if ( java.util.Objects.equals( server.getInfo(), def ) )
+ {
+ def = null;
+ }
+ ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), ComponentSerializer.parse( kick.getMessage() ), def, ServerKickEvent.State.CONNECTED, ServerKickEvent.Cause.SERVER ) ); // Waterfall
ServerKickEvent event = bungee.getPluginManager().callEvent( new ServerKickEvent( con, server.getInfo(), new BaseComponent[]
{
kick.getMessage()
- }, def, ServerKickEvent.State.CONNECTED ) );
+ }, def, ServerKickEvent.State.CONNECTED, ServerKickEvent.Cause.SERVER ) ); // Waterfall
if ( event.isCancelled() && event.getCancelServer() != null )
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 78e1ea37862e6be4179f8477fbdb69ce36af6233 Mon Sep 17 00:00:00 2001
From 841109177468b8cfec9a73b5aa0e3f2bab3e38a3 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
@ -66,10 +66,10 @@ index 91743f01..111404fb 100644
public int getTabThrottle() {
return tabThrottle;
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 5af9c3bb..166565a7 100644
index 5a3acccf..7e2688ee 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -718,7 +718,7 @@ public class BungeeCord extends ProxyServer
@@ -721,7 +721,7 @@ public class BungeeCord extends ProxyServer
@Override
public String getGameVersion()
{
@ -79,5 +79,5 @@ index 5af9c3bb..166565a7 100644
@Override
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From c7e03fafe03c044f0da356ac97c3b08d7b3d16c1 Mon Sep 17 00:00:00 2001
From c489acf737b0340bc283c49f39517a14736a58a1 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,10 +6,10 @@ 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 c3848b3c..a441a424 100644
index 0fe647b8..32af4937 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
@@ -128,6 +128,38 @@ public interface ProxiedPlayer extends Connection, CommandSender
*/
void connect(ServerInfo target, Callback<Boolean> callback);
@ -48,7 +48,7 @@ index c3848b3c..a441a424 100644
/**
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
@@ -139,6 +171,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
@@ -141,6 +173,25 @@ public interface ProxiedPlayer extends Connection, CommandSender
*/
void connect(ServerInfo target, Callback<Boolean> callback, ServerConnectEvent.Reason reason);
@ -75,10 +75,10 @@ index c3848b3c..a441a424 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 00c88e4d..242b693e 100644
index c8d5648c..7e36c0eb 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -281,9 +281,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -285,9 +285,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 00c88e4d..242b693e 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -377,7 +388,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -381,7 +392,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 00c88e4d..242b693e 100644
{
disconnect( bungee.getTranslation( "fallback_kick", connectionFailMessage( future.cause() ) ) );
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 02d85afb1a967d4b744be4c31c4709e3d20fb0f1 Mon Sep 17 00:00:00 2001
From 2fd518610d983a1b9a721c77588cbbedf059a507 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.42.0
2.44.0

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

@ -1,11 +1,11 @@
From d7ca4dd7a639155cacd0315119bf643584cf2da8 Mon Sep 17 00:00:00 2001
From 26e5efd5327231309bb9dcfc080e59baec9d6767 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 76a3ddd0..2aeca781 100644
index 250e7620..2207c3ff 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 @@
@ -32,7 +32,7 @@ index 76a3ddd0..2aeca781 100644
if ( packet != null )
{
+ packetTypeInfo = packet.getClass();
packet.read( in, prot.getDirection(), protocolVersion );
packet.read( in, protocol, prot.getDirection(), protocolVersion );
if ( in.isReadable() )
@@ -60,6 +65,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -53,5 +53,5 @@ index 76a3ddd0..2aeca781 100644
{
if ( slice != null )
--
2.42.0
2.44.0

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

@ -1,18 +1,18 @@
From d977b482d4497a46228913b145913aff3efe66df Mon Sep 17 00:00:00 2001
From bf5145136df8e794c207bb4c8c49c02dbf26eb6d 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 0f8f5885..b3c8c6e2 100644
index 7f0b6105..14ad2e71 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
@@ -238,4 +238,14 @@ public abstract class AbstractPacketHandler
public void handle(FinishConfiguration finishConfiguration) throws Exception
@@ -268,4 +268,14 @@ public abstract class AbstractPacketHandler
public void handle(CookieResponse cookieResponse) throws Exception
{
}
+
+
+ // Waterfall start
+ public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception
+ {
@ -117,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 242b693e..4d9db4de 100644
index 7e36c0eb..86223e17 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 @@
@ -130,7 +130,7 @@ index 242b693e..4d9db4de 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -126,6 +128,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -129,6 +131,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard();
@Getter
private final Collection<UUID> sentBossBars = new HashSet<>();
@ -142,10 +142,10 @@ index 242b693e..4d9db4de 100644
@Setter
private String lastCommandTabbed;
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 30fbb0b1..c412bbab 100644
index d4036c5d..ad9fc042 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
@@ -737,6 +737,32 @@ public class DownstreamBridge extends PacketHandler
@@ -753,6 +753,32 @@ public class DownstreamBridge extends PacketHandler
}
}
@ -216,5 +216,5 @@ index d15044f4..bea2bbff 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From fe8d22926e5d35ec817b333c8546f8ba527ead79 Mon Sep 17 00:00:00 2001
From 2bf7abb9ebc40d15e934aa076b27cbf421e5278e 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 c0a8ae4c..342551a6 100644
index be212472..1d2b4ec9 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -34,6 +34,18 @@
@ -175,5 +175,5 @@ index e0c52f21..37337429 100644
+ // Waterfall End
}
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From b82eb7c8e4f2c431657cf51961df1c9f67b426e0 Mon Sep 17 00:00:00 2001
From 327b543e487371de8d71f63218e9abdbb98f64d1 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.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 31f57df948a2fecc483cef4359d77e7c7e5e493d Mon Sep 17 00:00:00 2001
From 41dec9006eb4326433c948bfbdb271e353d066b2 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.42.0
2.44.0

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

@ -1,4 +1,4 @@
From ceefeced5e361ab808abd4831ce7ff9d45026855 Mon Sep 17 00:00:00 2001
From 96ff42638e839e92b966aaa95a50f8ee81cd16ea 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 07d49112..672a813d 100644
index 15546f07..5182b664 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -39,7 +39,7 @@ index 07d49112..672a813d 100644
</build>
diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644
index 00000000..f9a169cc
index 00000000..4bb98d5a
--- /dev/null
+++ b/log4j/pom.xml
@@ -0,0 +1,48 @@
@ -50,13 +50,13 @@ index 00000000..f9a169cc
+ <parent>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
+ <version>1.20-R0.2-SNAPSHOT</version>
+ <version>1.20-R0.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log4j</artifactId>
+ <version>1.20-R0.2-SNAPSHOT</version>
+ <version>1.20-R0.3-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Waterfall-Log4J</name>
@ -233,10 +233,10 @@ index 00000000..cfd039cd
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index a6684b7c..57ee7f23 100644
index 87ab1b76..f8491614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,12 +55,13 @@
@@ -48,12 +48,13 @@
<module>chat</module>
<module>config</module>
<module>event</module>
@ -253,7 +253,7 @@ index a6684b7c..57ee7f23 100644
</modules>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 342551a6..d3de9e34 100644
index 1d2b4ec9..15887222 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -71,7 +71,7 @@
@ -281,7 +281,7 @@ index 342551a6..d3de9e34 100644
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
@@ -130,6 +131,35 @@
<version>1.7.3</version>
<version>1.9.18</version>
<scope>runtime</scope>
</dependency>
+ <!-- Waterfall start - Console improvements - bring back slf4j-->
@ -362,7 +362,7 @@ index 00000000..765d24bc
+
+}
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 166565a7..71bb3d9d 100644
index 7e2688ee..066e740d 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -48,7 +48,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -373,7 +373,7 @@ index 166565a7..71bb3d9d 100644
import lombok.Getter;
import lombok.Setter;
import lombok.Synchronized;
@@ -81,15 +80,11 @@ import net.md_5.bungee.command.CommandEnd;
@@ -83,15 +82,11 @@ import net.md_5.bungee.command.CommandEnd;
import net.md_5.bungee.command.CommandIP;
import net.md_5.bungee.command.CommandPerms;
import net.md_5.bungee.command.CommandReload;
@ -389,7 +389,7 @@ index 166565a7..71bb3d9d 100644
import net.md_5.bungee.module.ModuleManager;
import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.DefinedPacket;
@@ -98,8 +93,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
@@ -100,8 +95,6 @@ import net.md_5.bungee.protocol.packet.PluginMessage;
import net.md_5.bungee.query.RemoteQuery;
import net.md_5.bungee.scheduler.BungeeScheduler;
import net.md_5.bungee.util.CaseInsensitiveMap;
@ -398,7 +398,7 @@ index 166565a7..71bb3d9d 100644
/**
* Main BungeeCord proxy class.
@@ -159,8 +152,12 @@ public class BungeeCord extends ProxyServer
@@ -161,8 +154,12 @@ public class BungeeCord extends ProxyServer
private final File pluginsFolder = new File( "plugins" );
@Getter
private final BungeeScheduler scheduler = new BungeeScheduler();
@ -411,7 +411,7 @@ index 166565a7..71bb3d9d 100644
@Getter
private final Logger logger;
public final Gson gson = new GsonBuilder()
@@ -204,6 +201,8 @@ public class BungeeCord extends ProxyServer
@@ -207,6 +204,8 @@ public class BungeeCord extends ProxyServer
// BungeeCord. This version is only used when extracting the libraries to their temp folder.
System.setProperty( "library.jansi.version", "BungeeCord" );
@ -420,7 +420,7 @@ index 166565a7..71bb3d9d 100644
AnsiConsole.systemInstall();
consoleReader = new ConsoleReader();
consoleReader.setExpandEvents( false );
@@ -228,6 +227,9 @@ public class BungeeCord extends ProxyServer
@@ -231,6 +230,9 @@ public class BungeeCord extends ProxyServer
// since it applies a nice looking format and also writes to the logfile.
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
@ -430,7 +430,7 @@ index 166565a7..71bb3d9d 100644
pluginManager = new PluginManager( this );
getPluginManager().registerCommand( null, new CommandReload() );
@@ -504,10 +506,7 @@ public class BungeeCord extends ProxyServer
@@ -507,10 +509,7 @@ public class BungeeCord extends ProxyServer
getLogger().info( "Thank you and goodbye" );
// Need to close loggers after last message!
@ -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 b7529bf3..00000000
index 1b61e3ad..00000000
--- a/slf4j/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
@ -572,14 +572,14 @@ index b7529bf3..00000000
-
- <parent>
- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-super</artifactId>
- <version>dev-SNAPSHOT</version>
- <artifactId>waterfall-parent</artifactId>
- <version>1.20-R0.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>io.github.waterfallmc</groupId>
- <artifactId>waterfall-slf4j</artifactId>
- <version>1.20-R0.2-SNAPSHOT</version>
- <version>1.20-R0.3-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>Waterfall-SLF4J</name>
@ -1629,5 +1629,5 @@ index 21a48df6..00000000
-
-}
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From ee8508af13a1c8addcd54fb2fddb5e366541b252 Mon Sep 17 00:00:00 2001
From eb16c1d6d89af2880d5f990ff91c661d4990fcf1 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.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 0c79b259f553abdc617e0aa12b53f54d3e47a7d1 Mon Sep 17 00:00:00 2001
From 744e3eab49b9499e6862219c0e051bccf115e03a 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
@ -23,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 1cc7936e..e83b2f21 100644
index 4bb98d5a..f9bdf71f 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -38,6 +38,24 @@
@ -52,5 +52,5 @@ index 1cc7936e..e83b2f21 100644
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 27d38f7079c9069b6568d6d7042d8e2e1422afea Mon Sep 17 00:00:00 2001
From f7d596841b8aff48baf598155d80ec2da93a7f3f 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.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 06e1719230949423936c9a395802628a77f09a76 Mon Sep 17 00:00:00 2001
From 901eb492361fe718242f5b038f80c06a7f1b01b2 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.42.0
2.44.0

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

@ -1,14 +1,14 @@
From 43c06de639e73d67cd03f36d12a406236ba8fec4 Mon Sep 17 00:00:00 2001
From 6568f09ce8c2d9ad4743de43363784c40c3bce11 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
diff --git a/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java b/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
index fa507753..a13eba79 100644
index 4c09efff..46517e03 100644
--- a/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
+++ b/api/src/main/java/net/md_5/bungee/api/event/LoginEvent.java
@@ -10,6 +10,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
@@ -8,6 +8,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.connection.PendingConnection;
import net.md_5.bungee.api.plugin.Cancellable;
@ -16,11 +16,10 @@ index fa507753..a13eba79 100644
/**
* Event called to represent a player logging in.
@@ -29,6 +30,14 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
@@ -26,6 +27,13 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
* Message to use when kicking if this event is canceled.
*/
@Setter(AccessLevel.NONE)
private BaseComponent[] cancelReasonComponents;
+
private BaseComponent reason;
+ // Waterfall start - adding the LoginResult variable to provide access to it, when calling the login event
+ /**
+ * The player's login result containing his textures
@ -31,7 +30,7 @@ index fa507753..a13eba79 100644
/**
* Connection attempting to login.
*/
@@ -40,6 +49,15 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
@@ -37,6 +45,15 @@ public class LoginEvent extends AsyncEvent<LoginEvent> implements Cancellable
this.connection = connection;
}
@ -46,16 +45,16 @@ index fa507753..a13eba79 100644
+
/**
* @return reason to be displayed
* @deprecated Use component methods instead.
* @deprecated use component methods instead
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java b/api/src/main/java/net/md_5/bungee/connection/LoginResult.java
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 9fd951be..488eff1d 100644
index b7dd5fe3..5fd26bf1 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
@@ -614,7 +614,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -644,7 +644,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
};
// fire login event
@ -65,5 +64,5 @@ index 9fd951be..488eff1d 100644
private void finish2()
--
2.42.0
2.44.0

12
BungeeCord-Patches/0040-Optionally-log-InitialHandler-connections.patch → BungeeCord-Patches/0039-Optionally-log-InitialHandler-connections.patch
View File

@ -1,4 +1,4 @@
From d139603bfda2a1fa02f3b5d53f2588d95052fe50 Mon Sep 17 00:00:00 2001
From a3bcb041e962b0aa7a546f475a52fb12ab6403f4 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,12 +61,12 @@ 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 488eff1d..0dfc1413 100644
index 5fd26bf1..ccc80506 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
@@ -356,7 +356,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break;
case 2:
@@ -380,7 +380,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
case 3:
transferred = handshake.getRequestedProtocol() == 3;
// Login
- bungee.getLogger().log( Level.INFO, "{0} has connected", this );
+ if (BungeeCord.getInstance().getConfig().isLogInitialHandlerConnections() ) // Waterfall
@ -77,5 +77,5 @@ index 488eff1d..0dfc1413 100644
ch.setProtocol( Protocol.LOGIN );
--
2.42.0
2.44.0

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

@ -1,14 +1,14 @@
From 06d7c7b413033551477403e14189e9deb92641a5 Mon Sep 17 00:00:00 2001
From 91929d2d6f6d32b63dd65b38fa1f1dd8ba39d55a 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 71bb3d9d..5cc308b8 100644
index 066e740d..f25ff75a 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
@@ -293,8 +293,6 @@ public class BungeeCord extends ProxyServer
registerChannel( ForgeConstants.FML_TAG );
registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
registerChannel( ForgeConstants.FORGE_REGISTER );
@ -18,18 +18,19 @@ index 71bb3d9d..5cc308b8 100644
isRunning = true;
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 7094fe0b..8911bee8 100644
index 37abb3c4..a468c5c4 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -73,7 +73,7 @@ public abstract class Configuration implements ProxyConfig
@@ -73,8 +73,8 @@ public abstract class Configuration implements ProxyConfig
private Favicon favicon;
private int compressionThreshold = 256;
private boolean preventProxyConnections;
- private boolean forgeSupport;
private boolean rejectTransfers;
+ private boolean forgeSupport = true; // Waterfall: default to enabled
@Synchronized("serversLock") // Waterfall
public void load()
--
2.42.0
2.44.0

6
BungeeCord-Patches/0042-Ignore-empty-packets.patch → BungeeCord-Patches/0041-Ignore-empty-packets.patch
View File

@ -1,4 +1,4 @@
From 7aae27e71a89d2753226c4f8340560fd06ab4db1 Mon Sep 17 00:00:00 2001
From 49038909ac940a1e6ccda7dd8d71fedf71f3bdb9 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,7 +8,7 @@ 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 776a0603..fa021598 100644
index 2207c3ff..655bcd46 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
@@ -45,6 +45,12 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -38,5 +38,5 @@ index 277e70e8..cf7dea17 100644
throw new CorruptedFrameException( "Empty Packet!" );
}
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 4510748e71ed701c4179156e3d3bf84226775558 Mon Sep 17 00:00:00 2001
From 3168598e19fb93e789d66b9434815a8121b59b14 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.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 4daf7cef8acb15511f300aa4507d6f4fb5c7c6d6 Mon Sep 17 00:00:00 2001
From 205d40bd64875c6ae94ce8c9e9c66ddfc13c6089 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,27 +57,28 @@ 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 f981313e..57136c2d 100644
index 307a417b..43d13e36 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -254,7 +254,7 @@ public class ServerConnector extends PacketHandler
@@ -264,7 +264,8 @@ 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 ) );
}
- if ( user.getSettings() != null )
+ if (!user.isDisableEntityMetadataRewrite() && user.getSettings() != null )
+ // Something deeper is going wrong here, but, as it stands, this project is EOL, so, we'll just shove this through.
+ if (user.getSettings() != null && (!user.isDisableEntityMetadataRewrite() || user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_20_2))
{
ch.write( user.getSettings() );
}
@@ -309,6 +309,7 @@ public class ServerConnector extends PacketHandler
@@ -319,6 +320,7 @@ public class ServerConnector extends PacketHandler
user.getTabListHandler().onServerChange();
Scoreboard serverScoreboard = user.getServerSentScoreboard();
+ if ( !user.isDisableEntityMetadataRewrite() ) { // Waterfall
for ( Objective objective : serverScoreboard.getObjectives() )
{
user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) );
@@ -321,6 +322,7 @@ public class ServerConnector extends PacketHandler
user.unsafe().sendPacket( new ScoreboardObjective(
@@ -342,6 +344,7 @@ public class ServerConnector extends PacketHandler
{
user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) );
}
@ -85,7 +86,7 @@ index f981313e..57136c2d 100644
serverScoreboard.clear();
for ( UUID bossbar : user.getSentBossBars() )
@@ -339,13 +341,34 @@ public class ServerConnector extends PacketHandler
@@ -360,13 +363,34 @@ public class ServerConnector extends PacketHandler
}
user.setDimensionChange( true );
@ -109,7 +110,7 @@ index f981313e..57136c2d 100644
+ }
+ 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(),
+ login.getPortalCooldown() );
+ login.getPortalCooldown(), login.isSecureProfile() );
+ user.unsafe().sendPacket(modLogin);
+ // Only send if we're in the same dimension
+ if ( login.getDimension() == user.getDimension() ) // Waterfall - defer
@ -122,14 +123,13 @@ index f981313e..57136c2d 100644
(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 85adab0f..9e2046a4 100644
index 86223e17..ee527938 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -801,4 +801,10 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
@@ -816,4 +816,9 @@ public final class UserConnection implements ProxiedPlayer
unsafe().sendPacket( new Transfer( host, port ) );
}
+
+ // Waterfall start
+ public boolean isDisableEntityMetadataRewrite() {
+ return entityRewrite == net.md_5.bungee.entitymap.EntityMap_Dummy.INSTANCE;
@ -137,10 +137,10 @@ index 85adab0f..9e2046a4 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 c412bbab..5966469b 100644
index ad9fc042..6ed25f82 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
@@ -741,6 +741,7 @@ public class DownstreamBridge extends PacketHandler
@@ -757,6 +757,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception
{
@ -148,7 +148,7 @@ index c412bbab..5966469b 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()) {
@@ -752,6 +753,7 @@ public class DownstreamBridge extends PacketHandler
@@ -768,6 +769,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
{
@ -157,7 +157,7 @@ index c412bbab..5966469b 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 c033118f..69accd42 100644
index ccebe19f..cb4f1098 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
@ -172,7 +172,7 @@ index c033118f..69accd42 100644
switch ( version )
{
case ProtocolConstants.MINECRAFT_1_8:
@@ -300,7 +305,13 @@ public abstract class EntityMap
@@ -304,7 +309,13 @@ public abstract class EntityMap
DefinedPacket.readVarInt( packet );
break;
default:
@ -225,5 +225,5 @@ index 00000000..cb81d1dd
+// Waterfall end
\ No newline at end of file
--
2.42.0
2.44.0

8
BungeeCord-Patches/0045-Add-ProxyDefineCommandsEvent.patch → BungeeCord-Patches/0044-Add-ProxyDefineCommandsEvent.patch
View File

@ -1,4 +1,4 @@
From 48553841b229f3e21ce0363be925f17657d4b8ef Mon Sep 17 00:00:00 2001
From 8c33d4de8183d34c90460a315ad42307e731c4dc 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,10 +54,10 @@ 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 a2995c60..e05e746c 100644
index 6ed25f82..1a863dc0 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
@@ -776,9 +776,25 @@ public class DownstreamBridge extends PacketHandler
@@ -792,9 +792,25 @@ public class DownstreamBridge extends PacketHandler
{
boolean modified = false;
@ -86,5 +86,5 @@ index a2995c60..e05e746c 100644
CommandNode dummy = LiteralArgumentBuilder.literal( command.getKey() ).executes( DUMMY_COMMAND )
.then( RequiredArgumentBuilder.argument( "args", StringArgumentType.greedyString() )
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From c6f351aa810086f14135c2821ae060c54905fe0d Mon Sep 17 00:00:00 2001
From 0a1e7a3cf67d728ae3daab2bbf0fede1f2d38bf7 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.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 0a62f3f1c21e3d233984a5c791a8f01edc3c4ecc Mon Sep 17 00:00:00 2001
From abcba7789455d7b64aa0d2d9d7b51c5e411dce3c 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.42.0
2.44.0

88
BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch → BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From 94e538b0a962da3d0d293ecafad4f7e99d257d1e Mon Sep 17 00:00:00 2001
From 6813e1365f919ea61338f6201b3ff516ec958752 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
@ -30,18 +30,10 @@ index 00000000..11e103cb
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/BadPacketException.java b/protocol/src/main/java/net/md_5/bungee/protocol/BadPacketException.java
index 6c0ef4df..f20104a2 100644
index 6c0ef4df..076ddd70 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/BadPacketException.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/BadPacketException.java
@@ -2,6 +2,7 @@ package net.md_5.bungee.protocol;
public class BadPacketException extends RuntimeException
{
+ private static final boolean PROCESS_TRACES = Boolean.getBoolean("waterfall.bad-packet-traces");
public BadPacketException(String message)
{
@@ -12,4 +13,24 @@ public class BadPacketException extends RuntimeException
@@ -12,4 +12,24 @@ public class BadPacketException extends RuntimeException
{
super( message, cause );
}
@ -50,7 +42,7 @@ index 6c0ef4df..f20104a2 100644
+ @Override
+ public Throwable initCause(Throwable cause)
+ {
+ if (PROCESS_TRACES) {
+ if (DefinedPacket.PROCESS_TRACES) {
+ return super.initCause(cause);
+ }
+ return this;
@ -59,7 +51,7 @@ index 6c0ef4df..f20104a2 100644
+ @Override
+ public Throwable fillInStackTrace()
+ {
+ if (PROCESS_TRACES) {
+ if (DefinedPacket.PROCESS_TRACES) {
+ return super.fillInStackTrace();
+ }
+ return this;
@ -67,20 +59,20 @@ 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 c1017e60..5ecb5c93 100644
index 6cd9e6a4..dffd3b7a 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
@@ -24,6 +24,9 @@ import se.llbit.nbt.Tag;
public abstract class DefinedPacket
{
@@ -47,6 +47,9 @@ public abstract class DefinedPacket
}
}
+ private static final boolean PROCESS_TRACES = Boolean.getBoolean("waterfall.bad-packet-traces");
+ private static final BadPacketException OVERSIZED_VAR_INT_EXCEPTION = new BadPacketException( "VarInt too big" );
+ public static final boolean PROCESS_TRACES = Boolean.getBoolean("waterfall.bad-packet-traces");
+ private static final OverflowPacketException OVERSIZED_VAR_INT_EXCEPTION = new OverflowPacketException( "VarInt too big" );
+ private static final BadPacketException NO_MORE_BYTES_EXCEPTION = new BadPacketException("No more bytes reading varint");
public static void writeString(String s, ByteBuf buf)
{
writeString( s, buf, Short.MAX_VALUE );
@@ -150,13 +153,18 @@ public abstract class DefinedPacket
@@ -242,13 +245,18 @@ public abstract class DefinedPacket
byte in;
while ( true )
{
@ -95,8 +87,8 @@ index c1017e60..5ecb5c93 100644
if ( bytes > maxBytes )
{
- throw new RuntimeException( "VarInt too big" );
+ throw PROCESS_TRACES ? new BadPacketException( "VarInt too big" ) : OVERSIZED_VAR_INT_EXCEPTION;
- throw new OverflowPacketException( "VarInt too big (max " + maxBytes + ")" );
+ throw PROCESS_TRACES ? new OverflowPacketException( "VarInt too big (max " + maxBytes + ")" ) : OVERSIZED_VAR_INT_EXCEPTION;
}
if ( ( in & 0x80 ) != 0x80 )
@ -133,7 +125,7 @@ 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 5f4ec289..3d806129 100644
index 655bcd46..52f76cd9 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
@@ -80,7 +80,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -145,20 +137,54 @@ index 5f4ec289..3d806129 100644
} finally
{
if ( slice != null )
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/OverflowPacketException.java b/protocol/src/main/java/net/md_5/bungee/protocol/OverflowPacketException.java
index 237955ab..d0bd4d75 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/OverflowPacketException.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/OverflowPacketException.java
@@ -2,9 +2,28 @@ package net.md_5.bungee.protocol;
public class OverflowPacketException extends RuntimeException
{
-
public OverflowPacketException(String message)
{
super( message );
}
+
+ // Waterfall start
+ @Override
+ public Throwable initCause(Throwable cause)
+ {
+ if (DefinedPacket.PROCESS_TRACES) {
+ return super.initCause(cause);
+ }
+ return this;
+ }
+
+ @Override
+ public Throwable fillInStackTrace()
+ {
+ if (DefinedPacket.PROCESS_TRACES) {
+ return super.fillInStackTrace();
+ }
+ return this;
+ }
+ // Waterfall end
}
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 0dfc1413..d7c29eb8 100644
index ccc80506..d8d65093 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;
import java.util.UUID;
import java.util.logging.Level;
import javax.crypto.SecretKey;
@@ -21,6 +21,8 @@ import javax.crypto.SecretKey;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.crypto.spec.SecretKeySpec;
+
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.BungeeCord;
@@ -472,6 +474,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
import lombok.ToString;
@@ -502,6 +504,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 +221,5 @@ index ac99d02c..0c1ecfb8 100644
// Waterfall start
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 888d05f5fba61d8aa230eebe869bce7e5c19fe82 Mon Sep 17 00:00:00 2001
From 838b44a67a3b27848d8185e5114e2dc9f8067afc 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.42.0
2.44.0

10
BungeeCord-Patches/0050-Add-exception-reporting-event.patch → BungeeCord-Patches/0049-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From 525b05ca4be2f52ce7819bda4bc52ddb2868c8cf Mon Sep 17 00:00:00 2001
From 21306c26f7c8a4074c9a3d5fbe1991a1d00efb52 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,10 +642,10 @@ index 014de202..40792a68 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 5cc308b8..3a86fac8 100644
index f25ff75a..b4e101ac 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;
@@ -10,6 +10,8 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.github.waterfallmc.waterfall.conf.WaterfallConfiguration;
@ -654,7 +654,7 @@ index 5cc308b8..3a86fac8 100644
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelException;
@@ -485,7 +487,11 @@ public class BungeeCord extends ProxyServer
@@ -488,7 +490,11 @@ public class BungeeCord extends ProxyServer
}
} catch ( Throwable t )
{
@ -695,5 +695,5 @@ index 38b75b51..02ec98fc 100644
// If we have a period of 0 or less, only run once
--
2.34.1
2.44.0

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

@ -1,4 +1,4 @@
From e6f5612067c9f90985f0e3d2f4359b176b2ac81d Mon Sep 17 00:00:00 2001
From 2ee860a1e91e6e08c061c0338dc60458afe618ca 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 e05e746c..006c7133 100644
index 1a863dc0..d5405b90 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
@@ -173,8 +173,14 @@ public class DownstreamBridge extends PacketHandler
@@ -174,8 +174,14 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(PlayerListItem playerList) throws Exception
{
@ -71,5 +71,5 @@ index e05e746c..006c7133 100644
@Override
--
2.42.0
2.44.0

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

@ -1,14 +1,14 @@
From 20f457fb1fb59705bfdcdf18850ada9533d98b76 Mon Sep 17 00:00:00 2001
From c702bcf84aeca3cc1e1791ef19e081b8e2df64d0 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 006c7133..485af04f 100644
index d5405b90..3bca89be 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
@@ -319,7 +319,7 @@ public class DownstreamBridge extends PacketHandler
@@ -332,7 +332,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 006c7133..485af04f 100644
brand.release();
// changes in the packet are ignored so we need to send it manually
--
2.42.0
2.44.0

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

@ -1,14 +1,14 @@
From 30d3802d87f843f01a3b02e53d4ca306abe11d42 Mon Sep 17 00:00:00 2001
From f1aae6c964dfc1b53891c412dbf2073e48f4ef36 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 d7c29eb8..f0346fc6 100644
index d8d65093..ffb078d6 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;
@@ -83,6 +83,8 @@ import net.md_5.bungee.util.QuietException;
public class InitialHandler extends PacketHandler implements PendingConnection
{
@ -17,7 +17,7 @@ index d7c29eb8..f0346fc6 100644
private final BungeeCord bungee;
private ChannelWrapper ch;
@Getter
@@ -500,7 +502,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -530,7 +532,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 d7c29eb8..f0346fc6 100644
Callback<String> handler = new Callback<String>()
{
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 371ddbcc82209081407cc1c3ed8af7a154ab6ce8 Mon Sep 17 00:00:00 2001
From eb138070bd28e41a49e7a750af37a0976d5f7e23 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.42.0
2.44.0

42
BungeeCord-Patches/0055-Additional-DoS-mitigations.patch → BungeeCord-Patches/0054-Additional-DoS-mitigations.patch
View File

@ -1,4 +1,4 @@
From 4860294f602b59bfd8013200d242ded589641a8b Mon Sep 17 00:00:00 2001
From 9510b1e224526e367d4b2dd77856336a5ed75493 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 5ecb5c93..70ec6c53 100644
index dffd3b7a..dafaba54 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
@@ -59,6 +59,7 @@ public abstract class DefinedPacket
@@ -82,6 +82,7 @@ public abstract class DefinedPacket
int len = readVarInt( buf );
if ( len > maxLen * 3 )
{
@ -19,7 +19,7 @@ index 5ecb5c93..70ec6c53 100644
throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
}
@@ -67,6 +68,7 @@ public abstract class DefinedPacket
@@ -90,6 +91,7 @@ public abstract class DefinedPacket
if ( s.length() > maxLen )
{
@ -27,7 +27,7 @@ index 5ecb5c93..70ec6c53 100644
throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
}
@@ -424,4 +426,21 @@ public abstract class DefinedPacket
@@ -567,4 +569,21 @@ public abstract class DefinedPacket
@Override
public abstract String toString();
@ -50,7 +50,7 @@ index 5ecb5c93..70ec6c53 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 3d806129..636ecc6d 100644
index 52f76cd9..3a4a735c 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;
@ -67,7 +67,7 @@ index 3d806129..636ecc6d 100644
{
packetTypeInfo = packet.getClass();
+ doLengthSanityChecks(in, packet, prot.getDirection(), packetId); // Waterfall: Additional DoS mitigations
packet.read( in, prot.getDirection(), protocolVersion );
packet.read( in, protocol, prot.getDirection(), protocolVersion );
if ( in.isReadable() )
{
@ -79,7 +79,7 @@ index 3d806129..636ecc6d 100644
throw new BadPacketException( "Packet " + protocol + ":" + prot.getDirection() + "/" + packetId + " (" + packet.getClass().getSimpleName() + ") larger than expected, extra bytes: " + in.readableBytes() );
}
} else
@@ -72,6 +78,11 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -72,6 +78,25 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
out.add( new PacketWrapper( packet, slice, protocol ) );
slice = null;
} catch (BadPacketException | IndexOutOfBoundsException e) {
@ -88,10 +88,32 @@ index 3d806129..636ecc6d 100644
+ throw e;
+ }
+ // Waterfall end
+ final String packetTypeStr;
+ if (packetTypeInfo instanceof Integer) {
+ packetTypeStr = "id " + Integer.toHexString((Integer) packetTypeInfo);
+ } else if (packetTypeInfo instanceof Class) {
+ packetTypeStr = "class " + ((Class) packetTypeInfo).getSimpleName();
+ } else {
+ packetTypeStr = "unknown";
+ }
+ throw new FastDecoderException("Error decoding packet " + packetTypeStr + " with contents:\n" + ByteBufUtil.prettyHexDump(slice), e); // Waterfall
+ // Waterfall start
+ } catch (Exception e) {
+ if (!DEBUG) {
+ throw e;
+ }
final String packetTypeStr;
if (packetTypeInfo instanceof Integer) {
packetTypeStr = "id " + Integer.toHexString((Integer) packetTypeInfo);
@@ -89,4 +100,52 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -81,6 +106,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
packetTypeStr = "unknown";
}
throw new FastDecoderException("Error decoding packet " + packetTypeStr + " with contents:\n" + ByteBufUtil.prettyHexDump(slice), e); // Waterfall
+ // Waterfall end
} finally
{
if ( slice != null )
@@ -89,4 +115,52 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
}
}
}
@ -235,5 +257,5 @@ index 738f0c92..ec33d337 100644
+ // Waterfall end
}
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 6f4f56effdd7fee9fb14aadbc893434ede4da78f Mon Sep 17 00:00:00 2001
From d748b38a6bfbafd428342cac2a8cdff6fe1be782 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.42.0
2.44.0

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

@ -1,4 +1,4 @@
From a824f915466921ca6b97c768ca373342a1f184a0 Mon Sep 17 00:00:00 2001
From 8eda531051300bfd546f283c371ea52d863e800f 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 f0346fc6..f067cfcf 100644
index ffb078d6..bb9063f6 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
@@ -764,9 +764,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -830,9 +830,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
for ( String id : content.split( "\0" ) )
{
@ -101,5 +101,5 @@ index f0346fc6..f067cfcf 100644
}
} else if ( input.getTag().equals( "UNREGISTER" ) || input.getTag().equals( "minecraft:unregister" ) )
--
2.42.0
2.44.0

14
BungeeCord-Patches/0058-ServerConnectRequest-sendFeedback.patch → BungeeCord-Patches/0057-ServerConnectRequest-sendFeedback.patch
View File

@ -1,4 +1,4 @@
From 974b20b184e44b3610e6238526a934bbe1344976 Mon Sep 17 00:00:00 2001
From 63ef97642f82dd1c190d47cc6b58a42fada64c2d 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,10 +31,10 @@ 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 a25f9e79..c75e9bad 100644
index ee527938..2813c16f 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -294,12 +294,16 @@ public final class UserConnection implements ProxiedPlayer
@@ -298,12 +298,16 @@ public final class UserConnection implements ProxiedPlayer
connect(info, callback, retry, ServerConnectEvent.Reason.PLUGIN, timeout);
}
@ -53,7 +53,7 @@ index a25f9e79..c75e9bad 100644
builder.connectTimeout(timeout); // Waterfall
if ( callback != null )
{
@@ -347,7 +351,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -351,7 +355,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTED, null );
}
@ -62,7 +62,7 @@ index a25f9e79..c75e9bad 100644
return;
}
if ( pendingConnects.contains( target ) )
@@ -357,7 +361,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -361,7 +365,7 @@ public final class UserConnection implements ProxiedPlayer
callback.done( ServerConnectRequest.Result.ALREADY_CONNECTING, null );
}
@ -71,7 +71,7 @@ index a25f9e79..c75e9bad 100644
return;
}
@@ -393,14 +397,14 @@ public final class UserConnection implements ProxiedPlayer
@@ -397,14 +401,14 @@ public final class UserConnection implements ProxiedPlayer
ServerInfo def = updateAndGetNextServer( target );
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
@ -90,5 +90,5 @@ index a25f9e79..c75e9bad 100644
}
}
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 372e00bb354ee567d0d9d8c6831b99538f2224f8 Mon Sep 17 00:00:00 2001
From 7cec69fe57fe38d7ce33e58023d690f9ade8219a 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,10 +13,10 @@ 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 c75e9bad..cbc45c5c 100644
index 2813c16f..f29a6f62 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -425,7 +425,8 @@ public final class UserConnection implements ProxiedPlayer
@@ -429,7 +429,8 @@ public final class UserConnection implements ProxiedPlayer
private String connectionFailMessage(Throwable cause)
{
@ -27,5 +27,5 @@ index c75e9bad..cbc45c5c 100644
@Override
--
2.42.0
2.44.0

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

@ -1,14 +1,14 @@
From 1a92c1c479b57073a5ba98af31966b93af7b2f50 Mon Sep 17 00:00:00 2001
From f97fb438b8ac483a526e36da5af9728bbb306b20 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 f067cfcf..baa5a58e 100644
index bb9063f6..f5959b66 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
@@ -474,6 +474,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -504,6 +504,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 f067cfcf..baa5a58e 100644
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
// Waterfall start
@@ -528,7 +529,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -558,7 +559,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
}
};
@ -26,5 +26,5 @@ index f067cfcf..baa5a58e 100644
}
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 7223638cd14c46a10da24716d163b72c129110ce Mon Sep 17 00:00:00 2001
From 788bf1c83bc29931fa2205fe3c804b0e8a3a59ba 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 7f001b11..82bfc51b 100644
index a8a91955..414d4578 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 7f001b11..82bfc51b 100644
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.TObjectIntMap;
import gnu.trove.map.hash.TIntObjectHashMap;
@@ -830,9 +832,12 @@ public enum Protocol
@@ -942,9 +944,12 @@ public enum Protocol
{
throw new BadPacketException( "Unsupported protocol version" );
}
@ -34,5 +34,5 @@ index 7f001b11..82bfc51b 100644
}
}
--
2.42.0
2.44.0

6
BungeeCord-Patches/0062-Expand-packet-decode-logging-usage.patch → BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch
View File

@ -1,11 +1,11 @@
From b33f4ed8e030c9898156cfeb8db6be204ad4b962 Mon Sep 17 00:00:00 2001
From 76c901d6879fc774867b51da71abb31c10bdc8ab 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 fd840d28..053cc9eb 100644
index 206f4227..954ffbc9 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
@@ -152,6 +152,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@ -24,5 +24,5 @@ index fd840d28..053cc9eb 100644
{
ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - corrupted frame: {1}", new Object[]
--
2.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 9c8d002cc916c5821eef456bace829fc76d2e1d1 Mon Sep 17 00:00:00 2001
From b8e82d2bdf3c1b23c0338fc239357eb7dc626f1f 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 baa5a58e..c3f5db1a 100644
index f5959b66..72d48c72 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
@@ -397,6 +397,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -427,6 +427,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
if ( BungeeCord.getInstance().config.isEnforceSecureProfile() && getVersion() < ProtocolConstants.MINECRAFT_1_19_3 )
{
@ -20,7 +20,7 @@ index baa5a58e..c3f5db1a 100644
if ( publicKey == null )
{
diff --git a/proxy/src/main/resources/messages.properties b/proxy/src/main/resources/messages.properties
index e42b798b..76ad621f 100644
index 149c742f..8d5075f6 100644
--- a/proxy/src/main/resources/messages.properties
+++ b/proxy/src/main/resources/messages.properties
@@ -25,6 +25,7 @@ offline_mode_player=\u00a7cNot authenticated with Minecraft.net
@ -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.42.0
2.44.0

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

@ -1,4 +1,4 @@
From 0f6f4601d455713102ad18766199c7cfb53c8ca1 Mon Sep 17 00:00:00 2001
From 25abd4454ef1e0caeeaad0e21866e8612528d916 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.
@ -6,10 +6,10 @@ Subject: [PATCH] Replace reflection inside netty with ChannelFactory.
Thanks for pointing it out @MrIvanPlays
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 3a86fac8..a7091ab6 100644
index b4e101ac..9b93d2c3 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -358,7 +358,7 @@ public class BungeeCord extends ProxyServer
@@ -361,7 +361,7 @@ public class BungeeCord extends ProxyServer
}
};
new ServerBootstrap()
@ -32,10 +32,10 @@ index 377df7ec..8f531f85 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 cbc45c5c..0281c393 100644
index f29a6f62..1d009633 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -410,7 +410,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -414,7 +414,7 @@ public final class UserConnection implements ProxiedPlayer
}
};
Bootstrap b = new Bootstrap()
@ -142,5 +142,5 @@ index af65e192..6a045d16 100644
{
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
--
2.42.0
2.44.0

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

@ -1,14 +1,14 @@
From 92b7609dd85a8eb3d8f300a34f8355eb5f1e1c3c Mon Sep 17 00:00:00 2001
From de091e83ba1da7002ffd7b951231c69da7a4ec7c 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 c3f5db1a..98b78de2 100644
index 72d48c72..0b5bee55 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
@@ -164,7 +164,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -186,7 +186,17 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -28,5 +28,5 @@ index c3f5db1a..98b78de2 100644
@Override
--
2.42.0
2.44.0

142
BungeeCord-Patches/0065-Prevent-proxy-commands-from-breaking-the-chat-chain-.patch Normal file
View File

@ -0,0 +1,142 @@
From 3b82a10c1ff1eacc4d4fa7d7fe16496c570c5662 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sun, 15 Oct 2023 00:36:38 +0100
Subject: [PATCH] Prevent proxy commands from breaking the chat chain system
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 14ad2e71..fe6c7339 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
@@ -277,5 +277,9 @@ public abstract class AbstractPacketHandler
public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
{
}
+
+ public void handle(net.md_5.bungee.protocol.packet.ClientChatAcknowledgement clientChatAcknowledgement)
+ {
+ }
// 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 414d4578..3a69fced 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
@@ -545,6 +545,13 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_19_1, 0x05 ),
map( ProtocolConstants.MINECRAFT_1_20_5, 0x06 )
);
+ // Waterfall start
+ TO_SERVER.registerPacket(
+ net.md_5.bungee.protocol.packet.ClientChatAcknowledgement.class,
+ net.md_5.bungee.protocol.packet.ClientChatAcknowledgement::new,
+ map (ProtocolConstants.MINECRAFT_1_19_3, 0x3)
+ );
+ // Waterfall end
TO_SERVER.registerPacket(
TabCompleteRequest.class,
TabCompleteRequest::new,
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChatAcknowledgement.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChatAcknowledgement.java
new file mode 100644
index 00000000..08ecf2a3
--- /dev/null
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientChatAcknowledgement.java
@@ -0,0 +1,33 @@
+package net.md_5.bungee.protocol.packet;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import net.md_5.bungee.protocol.AbstractPacketHandler;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.ProtocolConstants;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class ClientChatAcknowledgement extends DefinedPacket {
+ private int offset;
+
+ @Override
+ public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) {
+ this.offset = DefinedPacket.readVarInt(buf);
+ }
+
+ @Override
+ public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion) {
+ DefinedPacket.writeVarInt(this.offset, buf);
+ }
+
+ @Override
+ public void handle(AbstractPacketHandler handler) throws Exception {
+ handler.handle(this);
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
index fb53ba74..f8e2db8d 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/ClientCommand.java
@@ -118,4 +118,9 @@ public class ClientCommand extends DefinedPacket
{
handler.handle( this );
}
+
+ public boolean isSigned() {
+ if (salt == 0) return false;
+ return this.seenMessages != null && !this.seenMessages.getAcknowledged().isEmpty();
+ }
}
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 740c90ec..134a843f 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
@@ -196,16 +196,22 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(ClientCommand command) throws Exception
{
- handleChat( "/" + command.getCommand() );
+ handleChat( "/" + command.getCommand(), command, null ); // Waterfall
}
@Override
public void handle(ClientCommandSigned command) throws Exception
{
- handleChat( "/" + command.getCommand() );
+ handleChat( "/" + command.getCommand(), null, command ); // Waterfall
}
private String handleChat(String message)
+ {
+ // Waterfall start
+ return handleChat(message, null, null);
+ }
+ private String handleChat(String message, @javax.annotation.Nullable ClientCommand clientCommand, @javax.annotation.Nullable ClientCommandSigned clientCommandSigned)
+ // Waterfall end
{
for ( int index = 0, length = message.length(); index < length; index++ )
{
@@ -224,7 +230,18 @@ public class UpstreamBridge extends PacketHandler
if ( !chatEvent.isCommand() || !bungee.getPluginManager().dispatchCommand( con, message.substring( 1 ) ) )
{
return message;
+ // Waterfall start - We're going to cancel this packet, so, no matter what, we might as well try to send this
+ } else if (clientCommand != null && clientCommand.isSigned() && clientCommand.getSeenMessages() != null) {
+ if (con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_19_3) {
+ con.getServer().unsafe().sendPacket(new net.md_5.bungee.protocol.packet.ClientChatAcknowledgement(clientCommand.getSeenMessages().getOffset()));
+ }
+ // and then for the new one
+ } else if (clientCommandSigned != null) {
+ if (con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_20_5) {
+ con.getServer().unsafe().sendPacket(new net.md_5.bungee.protocol.packet.ClientChatAcknowledgement(clientCommandSigned.getSeenMessages().getOffset()));
+ }
}
+ // Waterfall end
}
throw CancelSendSignal.INSTANCE;
}
--
2.44.0

21
BungeeCord-Patches/0066-eol-message.patch Normal file
View File

@ -0,0 +1,21 @@
From 168aca2c4cae1c77efbbd156345ead5234c113ab Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@benndorf.dev>
Date: Fri, 22 Mar 2024 09:20:53 +0100
Subject: [PATCH] eol message
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
index 96a9998d..72d6a15d 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -64,6 +64,7 @@ public class BungeeCordLauncher
BungeeCord bungee = new BungeeCord();
ProxyServer.setInstance( bungee );
bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
+ bungee.getLogger().warning("Waterfall has reached end of life and is no longer maintained. We recommend you transition to Velocity (https://papermc.io/software/velocity). For more information, see the announcement (https://forums.papermc.io/threads/1088/)."); // Waterfall - eol message
bungee.start();
if ( !options.has( "noconsole" ) )
--
2.44.0

16
README.md
View File

@ -1,6 +1,10 @@
Waterfall
=========
> [!CAUTION]
> This project has reached end of life and is no longer maintained.
> We recommend you transition to [Velocity](https://papermc.io/software/velocity). For more information, see the [announcement](https://forums.papermc.io/threads/1088/).
Waterfall is a fork of the well-known [BungeeCord](https://github.com/SpigotMC/BungeeCord) server teleportation suite.
Waterfall focuses on three main areas:
@ -20,14 +24,14 @@ Waterfall will still track upstream BungeeCord and merge changes as needed.
## How To (Server Admins)
Download a copy of Waterfall.jar from our homepage here: [Waterfall](https://papermc.io/downloads#Waterfall)
Download a copy of Waterfall.jar from our homepage here: [Waterfall](https://papermc.io/downloads/waterfall)
Waterfall requires **Java 8** or above.
## How To (Plugin Developers)
------
* See our API patches [here](BungeeCord-Patches)
* Waterfall API JavaDocs here: [papermc.io/javadocs](https://papermc.io/javadocs)
* Waterfall API JavaDocs here: [papermc.io/javadocs](https://jd.papermc.io/waterfall/1.20)
* Maven repository (for `waterfall-api`):
```xml
<repository>
@ -40,7 +44,7 @@ Waterfall requires **Java 8** or above.
<dependency>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-api</artifactId>
<version>1.20-R0.2-SNAPSHOT</version>
<version>1.20-R0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
```
@ -58,7 +62,7 @@ repositories {
* Artifact:
```groovy
dependencies {
compileOnly 'io.github.waterfallmc:waterfall-api:1.20-R0.2-SNAPSHOT'
compileOnly 'io.github.waterfallmc:waterfall-api:1.20-R0.3-SNAPSHOT'
}
```
@ -71,8 +75,8 @@ Clone this repo, run `./waterfall b` from *bash*, get jar from Waterfall-Proxy/b
## Join us
* Feel free to open a PR! We accept contributions.
* Join us on IRC (irc.esper.net #waterfall, [webchat](https://webchat.esper.net/?channels=waterfall)) or [Discord](https://discord.gg/papermc).
* Visit our forums (https://papermc.io/forums).
* Join us on [Discord](https://discord.gg/papermc).
* Visit our forums (https://forums.papermc.io/).
## Special Thanks To