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

Updated Upstream (BungeeCord) (#601)

This commit is contained in:
FivePB (Xer) 2021-01-29 11:35:23 +01:00 committed by GitHub
parent 3bac1f3631
commit b3e581412f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 80 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 9c078b78c32863c59765e56d7e5164d0762ac563
Subproject commit 3d701fbe0ec690d83c10487c57e7dbff353fb0d7

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

@ -1,4 +1,4 @@
From fa3d98cd242a0e7f3553b77138e032d1a653bae4 Mon Sep 17 00:00:00 2001
From f2cb918e20677ae75ff1683781ccf6f79949ec6d 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 cb49a443..f72ac5c0 100644
index a502e8c3..0eb61e1d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -18,7 +18,7 @@ index cb49a443..f72ac5c0 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -26,7 +26,7 @@ index cb49a443..f72ac5c0 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -67,7 +67,7 @@ index cb49a443..f72ac5c0 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 901d5ae8..22974d80 100644
index 99173dbc..7e6a4f39 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -78,7 +78,7 @@ index 901d5ae8..22974d80 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -86,7 +86,7 @@ index 901d5ae8..22974d80 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -145,7 +145,7 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index 8dcde4f2..8523d99a 100644
index d7aca2ad..85309233 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,19 +4,19 @@
@ -156,7 +156,7 @@ index 8dcde4f2..8523d99a 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -164,7 +164,7 @@ index 8dcde4f2..8523d99a 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -175,7 +175,7 @@ index 8dcde4f2..8523d99a 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 8a857dfd..099a4643 100644
index bfb82d52..38db2292 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -186,7 +186,7 @@ index 8a857dfd..099a4643 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -194,7 +194,7 @@ index 8a857dfd..099a4643 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -205,7 +205,7 @@ index 8a857dfd..099a4643 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index a705f1a6..f4f7fdb0 100644
index 6c26e547..82a411b0 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -216,7 +216,7 @@ index a705f1a6..f4f7fdb0 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -224,7 +224,7 @@ index a705f1a6..f4f7fdb0 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -233,7 +233,7 @@ index a705f1a6..f4f7fdb0 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 64c0ba67..93bd4bcc 100644
index fd735eb7..646dbfae 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -244,7 +244,7 @@ index 64c0ba67..93bd4bcc 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -252,7 +252,7 @@ index 64c0ba67..93bd4bcc 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -274,7 +274,7 @@ index 64c0ba67..93bd4bcc 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index b198f2b9..8eea364f 100644
index 7d912e90..472314c2 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -285,7 +285,7 @@ index b198f2b9..8eea364f 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -293,11 +293,11 @@ index b198f2b9..8eea364f 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index f9077320..9a2eb779 100644
index c8f2353f..de8faee0 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -308,7 +308,7 @@ index f9077320..9a2eb779 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -316,11 +316,11 @@ index f9077320..9a2eb779 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 31b023a7..57b0cdd8 100644
index 46dd4b65..0cab9a7a 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -331,7 +331,7 @@ index 31b023a7..57b0cdd8 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -339,11 +339,11 @@ index 31b023a7..57b0cdd8 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index a34006b8..990c0a6d 100644
index 6158b2cb..240c9548 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -354,7 +354,7 @@ index a34006b8..990c0a6d 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -362,11 +362,11 @@ index a34006b8..990c0a6d 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index 898aa804..1b4e0455 100644
index 7ce143ad..4c13d517 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -377,7 +377,7 @@ index 898aa804..1b4e0455 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -385,11 +385,11 @@ index 898aa804..1b4e0455 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index 3bf2f3d3..0b9fc4aa 100644
index e0cec205..c9849b6c 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -400,7 +400,7 @@ index 3bf2f3d3..0b9fc4aa 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -408,7 +408,7 @@ index 3bf2f3d3..0b9fc4aa 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -438,7 +438,7 @@ index 3bf2f3d3..0b9fc4aa 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index 5da5949b..0d3a3b70 100644
index 5d3d81d5..45910b0e 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@ -449,7 +449,7 @@ index 5da5949b..0d3a3b70 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -457,11 +457,11 @@ index 5da5949b..0d3a3b70 100644
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index 8d347068..ec465dd3 100644
index cf46174c..db15febb 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -472,7 +472,7 @@ index 8d347068..ec465dd3 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -480,7 +480,7 @@ index 8d347068..ec465dd3 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -491,7 +491,7 @@ index 8d347068..ec465dd3 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 85ee0687..91aeffe5 100644
index b077a506..cc177f38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -509,7 +509,7 @@ index 85ee0687..91aeffe5 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -704,7 +704,7 @@ index 85ee0687..91aeffe5 100644
</profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 186264e0..8571f378 100644
index 5ec853a5..402266ca 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -715,7 +715,7 @@ index 186264e0..8571f378 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -723,7 +723,7 @@ index 186264e0..8571f378 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -745,7 +745,7 @@ index 186264e0..8571f378 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index ac8e8974..fcd1109e 100644
index 9f663469..4aeb9cbe 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -756,7 +756,7 @@ index ac8e8974..fcd1109e 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -764,7 +764,7 @@ index ac8e8974..fcd1109e 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -816,7 +816,7 @@ index ac8e8974..fcd1109e 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index 7d13eb60..1c845a6d 100644
index 3023d072..8ce88f4a 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -827,7 +827,7 @@ index 7d13eb60..1c845a6d 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -835,7 +835,7 @@ index 7d13eb60..1c845a6d 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.16-R0.4-SNAPSHOT</version>
<version>1.16-R0.5-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -857,5 +857,5 @@ index 7d13eb60..1c845a6d 100644
<scope>compile</scope>
</dependency>
--
2.29.2
2.25.1

20
BungeeCord-Patches/0036-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 39df736127646bf3172ae647b0c50670f2c57327 Mon Sep 17 00:00:00 2001
From 272eec6293195f696c8612be5139afcdc2535b63 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 22974d80..0a890393 100644
index 7e6a4f39..c51531eb 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -39,7 +39,7 @@ index 22974d80..0a890393 100644
</build>
diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644
index 00000000..e49a40ee
index 00000000..b099b20c
--- /dev/null
+++ b/log4j/pom.xml
@@ -0,0 +1,48 @@
@ -50,13 +50,13 @@ index 00000000..e49a40ee
+ <parent>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
+ <version>1.16-R0.4-SNAPSHOT</version>
+ <version>1.16-R0.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log4j</artifactId>
+ <version>1.16-R0.4-SNAPSHOT</version>
+ <version>1.16-R0.5-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Waterfall-Log</name>
@ -233,7 +233,7 @@ index 00000000..93ce3b14
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index db1e0722..fd03c640 100644
index cc177f38..fa4dd98d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
@ -245,7 +245,7 @@ index db1e0722..fd03c640 100644
<module>protocol</module>
<module>proxy</module>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 9d0e545f..f0c36550 100644
index 168eab5c..7a872a54 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -65,7 +65,7 @@
@ -258,7 +258,7 @@ index 9d0e545f..f0c36550 100644
<scope>compile</scope>
</dependency>
@@ -99,6 +99,20 @@
<version>5.1.48</version>
<version>5.1.49</version>
<scope>runtime</scope>
</dependency>
+
@ -391,7 +391,7 @@ index 8c933123..d71556a7 100644
pluginManager = new PluginManager( this );
getPluginManager().registerCommand( null, new CommandReload() );
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 4c119b9d..dc2c584d 100644
index a4fe8aad..e830198d 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -63,6 +63,9 @@ public class BungeeCordLauncher
@ -458,5 +458,5 @@ index 10366c88..8c5cc949 100644
}
--
2.29.0.windows.1
2.25.1

10
BungeeCord-Patches/0038-Allow-plugins-to-use-SLF4J-for-logging.patch
View File

@ -1,15 +1,15 @@
From 160c7c7c0ddf721253a40fb97aa4abdb6813510a Mon Sep 17 00:00:00 2001
From 3d5a4ae38173de11134fe922a4fd2cb76e4d90bf Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
diff --git a/api/pom.xml b/api/pom.xml
index f72ac5c0..10db38b7 100644
index 0eb61e1d..c2b55587 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -55,5 +55,11 @@
<version>1.26</version>
<version>1.27</version>
<scope>compile</scope>
</dependency>
+ <!-- Waterfall - Add SLF4J -->
@ -39,7 +39,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 e49a40ee..1cd12d6a 100644
index b099b20c..8baf329b 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -38,6 +38,12 @@
@ -56,5 +56,5 @@ index e49a40ee..1cd12d6a 100644
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
--
2.29.0.windows.1
2.25.1

24
BungeeCord-Patches/0048-Use-proper-max-length-for-serverbound-chat-packet.patch
View File

@ -1,15 +1,15 @@
From 07d364ecda023268acd62962e90d9002359437d7 Mon Sep 17 00:00:00 2001
From 4de2289a69e998b32e548dc57e4819cd138e1611 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 20 Mar 2019 21:39:12 -0700
Subject: [PATCH] Use proper max length for serverbound chat packet
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 f4470588..4b006833 100644
index 0cef9430..d51a3142 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
@@ -45,6 +45,34 @@ public abstract class DefinedPacket
return new String( b, Charsets.UTF_8 );
@@ -56,6 +56,20 @@ public abstract class DefinedPacket
return s;
}
+ // Waterfall start
@ -24,20 +24,6 @@ index f4470588..4b006833 100644
+ writeVarInt( b.length, buf );
+ buf.writeBytes( b );
+ }
+
+ public static String readString(ByteBuf buf, final int maxLength)
+ {
+ int len = readVarInt( buf );
+ if ( len > maxLength )
+ {
+ throw new OverflowPacketException( String.format( "Cannot receive string longer than %s (got %s characters)", maxLength, len ) );
+ }
+
+ byte[] b = new byte[ len ];
+ buf.readBytes( b );
+
+ return new String( b, Charsets.UTF_8 );
+ }
+ // Waterfall end
+
public static void writeArray(byte[] b, ByteBuf buf)
@ -72,5 +58,5 @@ index 7a0a1ce7..828a5dbe 100644
if ( direction == ProtocolConstants.Direction.TO_CLIENT )
{
--
2.29.0.windows.1
2.30.0

8
BungeeCord-Patches/0052-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From eebd97973aff4d2912fd7ee9ca362c1658ae8a6d Mon Sep 17 00:00:00 2001
From 5b7a8861bb1b6079762e28a1a14711de15db3fe8 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 25 Nov 2019 19:54:06 +0000
Subject: [PATCH] Speed up some common exceptions
@ -67,7 +67,7 @@ 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 4b006833..f6e4859f 100644
index d51a3142..d10cf2ed 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
@@ -19,6 +19,9 @@ import se.llbit.nbt.Tag;
@ -80,7 +80,7 @@ index 4b006833..f6e4859f 100644
public static void writeString(String s, ByteBuf buf)
{
if ( s.length() > Short.MAX_VALUE )
@@ -153,13 +156,18 @@ public abstract class DefinedPacket
@@ -150,13 +153,18 @@ public abstract class DefinedPacket
byte in;
while ( true )
{
@ -195,5 +195,5 @@ index ac99d02c..0c1ecfb8 100644
// Waterfall start
--
2.29.2
2.30.0

22
BungeeCord-Patches/0060-Limit-login-request-data-to-16-bytes.patch
View File

@ -1,22 +0,0 @@
From b6fab333e8186ca61c8b646910d0d8984fbb6ca3 Mon Sep 17 00:00:00 2001
From: Linus Hochbaum <linus@hochbaum.dev>
Date: Thu, 21 Jan 2021 11:59:51 +0100
Subject: [PATCH] Limit login request data to 16 bytes
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
index 32ba098c..524e7b67 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
@@ -24,7 +24,7 @@ public class LoginRequest extends DefinedPacket
@Override
public void read(ByteBuf buf)
{
- data = readString( buf );
+ data = readString( buf, 16 ); // Waterfall - Limit max. name length to 16 bytes.
}
@Override
--
2.29.2