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

Updated Upstream (BungeeCord) (#549) 

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

BungeeCord Changes:
15b51413 #2908: Don't frame packets for dead connections
a0f9333a Bump version to 1.16-R0.4-SNAPSHOT
287e28a7 Release 1.16-R0.3
c1522ab9 #2909: Don't serialise as array for single element contents
0af4bfdb #2905: HoverEvent getValue compat method
This commit is contained in:
riku6460 2020-07-19 22:26:04 +09:00 committed by GitHub
parent 6f55959a10
commit a6198586d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 96 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 94c4fcbad7cd6f16b31de291ddec0d254d997550
Subproject commit 15b514130eb861cb44ddc787aa152f73e259dbb1

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

@ -1,4 +1,4 @@
From 9580c58394aeeadb27f83ea26bbacfa3dc142056 Mon Sep 17 00:00:00 2001
From 7fd6f860c803a268d2967d694d798eeba78dbd68 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 470c0611..fd8b40f2 100644
index b0220028..6902ba31 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -18,7 +18,7 @@ index 470c0611..fd8b40f2 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -26,7 +26,7 @@ index 470c0611..fd8b40f2 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -67,7 +67,7 @@ index 470c0611..fd8b40f2 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index a80047ad..3f3aaef4 100644
index c07793a9..c2826536 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -78,7 +78,7 @@ index a80047ad..3f3aaef4 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -86,7 +86,7 @@ index a80047ad..3f3aaef4 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -145,19 +145,18 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index b4efdd6a..4c08a151 100644
index 8dcde4f2..8523d99a 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,19 +4,20 @@
@@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -165,7 +164,7 @@ index b4efdd6a..4c08a151 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -176,7 +175,7 @@ index b4efdd6a..4c08a151 100644
<dependencies>
<dependency>
diff --git a/config/pom.xml b/config/pom.xml
index 12fa6ad9..43542e86 100644
index 26f25afe..5f4f2b33 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -187,7 +186,7 @@ index 12fa6ad9..43542e86 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -195,7 +194,7 @@ index 12fa6ad9..43542e86 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -206,7 +205,7 @@ index 12fa6ad9..43542e86 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index dc124c0f..c5c7f8b4 100644
index a705f1a6..f4f7fdb0 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -217,7 +216,7 @@ index dc124c0f..c5c7f8b4 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -225,7 +224,7 @@ index dc124c0f..c5c7f8b4 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -234,7 +233,7 @@ index dc124c0f..c5c7f8b4 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 392559d1..5cb1bd19 100644
index 64c0ba67..93bd4bcc 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -245,7 +244,7 @@ index 392559d1..5cb1bd19 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -253,7 +252,7 @@ index 392559d1..5cb1bd19 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -275,7 +274,7 @@ index 392559d1..5cb1bd19 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 0d829883..809f8bb6 100644
index b198f2b9..8eea364f 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -286,7 +285,7 @@ index 0d829883..809f8bb6 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -294,11 +293,11 @@ index 0d829883..809f8bb6 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 2ccf36f1..f4a45cec 100644
index f9077320..9a2eb779 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -309,7 +308,7 @@ index 2ccf36f1..f4a45cec 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -317,11 +316,11 @@ index 2ccf36f1..f4a45cec 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 10e5ad4d..5c4c1717 100644
index 31b023a7..57b0cdd8 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -332,7 +331,7 @@ index 10e5ad4d..5c4c1717 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -340,11 +339,11 @@ index 10e5ad4d..5c4c1717 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 651a0061..ed209b57 100644
index a34006b8..990c0a6d 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -355,7 +354,7 @@ index 651a0061..ed209b57 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -363,11 +362,11 @@ index 651a0061..ed209b57 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index ddf23fbd..542d42c3 100644
index 898aa804..1b4e0455 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -378,7 +377,7 @@ index ddf23fbd..542d42c3 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -386,11 +385,11 @@ index ddf23fbd..542d42c3 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index 85c021bf..b195f687 100644
index 3bf2f3d3..0b9fc4aa 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -401,7 +400,7 @@ index 85c021bf..b195f687 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -409,7 +408,7 @@ index 85c021bf..b195f687 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -439,7 +438,7 @@ index 85c021bf..b195f687 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index 8779e12d..e46cf142 100644
index 5da5949b..0d3a3b70 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@ -450,7 +449,7 @@ index 8779e12d..e46cf142 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -458,11 +457,11 @@ index 8779e12d..e46cf142 100644
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index e819249a..6453a6f0 100644
index 8d347068..ec465dd3 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -473,7 +472,7 @@ index e819249a..6453a6f0 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -481,7 +480,7 @@ index e819249a..6453a6f0 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -492,7 +491,7 @@ index e819249a..6453a6f0 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index c0de9532..c5b8e7f3 100644
index e482fa86..4112b4e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -510,7 +509,7 @@ index c0de9532..c5b8e7f3 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -706,7 +705,7 @@ index c0de9532..c5b8e7f3 100644
</profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 4ac6c453..cfc33af2 100644
index 186264e0..8571f378 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -717,7 +716,7 @@ index 4ac6c453..cfc33af2 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -725,7 +724,7 @@ index 4ac6c453..cfc33af2 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -747,7 +746,7 @@ index 4ac6c453..cfc33af2 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 7fbb0be4..3727c44b 100644
index ac8e8974..fcd1109e 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -758,7 +757,7 @@ index 7fbb0be4..3727c44b 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -766,7 +765,7 @@ index 7fbb0be4..3727c44b 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -818,7 +817,7 @@ index 7fbb0be4..3727c44b 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index c023c6bf..98abf706 100644
index 7d13eb60..1c845a6d 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -829,7 +828,7 @@ index c023c6bf..98abf706 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -837,7 +836,7 @@ index c023c6bf..98abf706 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.16-R0.3-SNAPSHOT</version>
<version>1.16-R0.4-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -859,5 +858,5 @@ index c023c6bf..98abf706 100644
<scope>compile</scope>
</dependency>
--
2.27.0
2.25.1

8
BungeeCord-Patches/0013-Better-unit-tests-for-Chat-API.patch
View File

@ -1,14 +1,14 @@
From 260c23c3d1bce99d202f01c684743e7c61112460 Mon Sep 17 00:00:00 2001
From 914e63b8024182183a313a03f1d72b4bd8bd3681 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 3922fbea..b28d9218 100644
index 23fa3024..c4a7ee5e 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
@@ -438,6 +438,26 @@ public class ComponentsTest
@@ -450,6 +450,26 @@ public class ComponentsTest
Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
}
@ -53,5 +53,5 @@ index 9e37eed0..a25a01b8 100644
+ }
}
--
2.27.0
2.25.1

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

@ -1,4 +1,4 @@
From de6f03073252328849c1525aabcccf334dd897ae Mon Sep 17 00:00:00 2001
From a8b84c461be62c15ce5fd104cb2938318388e5e9 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 ea44573d..5b32effe 100644
index d36b7f3c..5e03e175 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -16,6 +16,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -27,7 +27,7 @@ index ea44573d..5b32effe 100644
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
@@ -27,7 +35,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -34,7 +42,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
{
int packetId = DefinedPacket.readVarInt( in );
@ -93,7 +93,7 @@ index 1bf5e34c..7ef80bf5 100644
ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 53b12482..001ee1c2 100644
index 99af41b3..69a44db1 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -72,6 +72,7 @@ public final class UserConnection implements ProxiedPlayer
@ -122,5 +122,5 @@ index 2622b738..3c4ecf0e 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.20.1.windows.1
2.25.1

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

@ -1,11 +1,11 @@
From c59995528d7529b70f4c8b323762b6afb01da957 Mon Sep 17 00:00:00 2001
From 5622d256e0495063202405cc950979edbd464bde 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 5b32effe..9e9ea49c 100644
index 5e03e175..961887c9 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -1,7 +1,9 @@
@ -18,7 +18,7 @@ index 5b32effe..9e9ea49c 100644
import io.netty.handler.codec.MessageToMessageDecoder;
import java.util.List;
import lombok.AllArgsConstructor;
@@ -31,13 +33,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -38,13 +40,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
Protocol.DirectionData prot = ( server ) ? protocol.TO_SERVER : protocol.TO_CLIENT;
ByteBuf slice = in.copy(); // Can't slice this one due to EntityMap :(
@ -35,7 +35,7 @@ index 5b32effe..9e9ea49c 100644
packet.read( in, prot.getDirection(), protocolVersion );
if ( in.isReadable() )
@@ -51,6 +56,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -58,6 +63,16 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
out.add( new PacketWrapper( packet, slice ) );
slice = null;
@ -53,5 +53,5 @@ index 5b32effe..9e9ea49c 100644
{
if ( slice != null )
--
2.26.1
2.25.1

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

@ -1,4 +1,4 @@
From 01d375838823addacb356489795bf886c31565f3 Mon Sep 17 00:00:00 2001
From 1f334536d074fd19cbd7228ed93a2cb5e03b6b96 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 3f3aaef4..3730c14c 100644
index c2826536..a43db907 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -39,7 +39,7 @@ index 3f3aaef4..3730c14c 100644
</build>
diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644
index 00000000..5fbc5af6
index 00000000..e49a40ee
--- /dev/null
+++ b/log4j/pom.xml
@@ -0,0 +1,48 @@
@ -50,13 +50,13 @@ index 00000000..5fbc5af6
+ <parent>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
+ <version>1.16-R0.3-SNAPSHOT</version>
+ <version>1.16-R0.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log4j</artifactId>
+ <version>1.16-R0.3-SNAPSHOT</version>
+ <version>1.16-R0.4-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 c5b8e7f3..97908819 100644
index 4112b4e4..3ca7ca91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
@ -245,7 +245,7 @@ index c5b8e7f3..97908819 100644
<module>protocol</module>
<module>proxy</module>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index d52692f2..fca4d609 100644
index 9d0e545f..f0c36550 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -65,7 +65,7 @@
@ -458,5 +458,5 @@ index 10366c88..8c5cc949 100644
}
--
2.27.0
2.25.1

12
BungeeCord-Patches/0044-Ignore-empty-packets.patch
View File

@ -1,4 +1,4 @@
From c409a5ecb881ba5ef02c8ab7ebc5de55a23755b0 Mon Sep 17 00:00:00 2001
From 25d644ee21e0ebfc53376a8da62c5079c2d55a32 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 12 Oct 2018 14:28:52 +0100
Subject: [PATCH] Ignore empty packets
@ -8,10 +8,10 @@ packets will be ignored. While empty packets are a sign of bad plugins,
they are effectivly harmless vs the cost of the exception in general
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index 9e9ea49c..71ddf022 100644
index 961887c9..a2c72c9b 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
@@ -36,6 +36,12 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -43,6 +43,12 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
Object packetTypeInfo = null;
try
{
@ -25,10 +25,10 @@ index 9e9ea49c..71ddf022 100644
packetTypeInfo = packetId;
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
index e903fd09..25ee2027 100644
index 647394ba..f297620c 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
@@ -30,7 +30,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
@@ -40,7 +40,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
if ( buf[i] >= 0 )
{
int length = DefinedPacket.readVarInt( Unpooled.wrappedBuffer( buf ) );
@ -38,5 +38,5 @@ index e903fd09..25ee2027 100644
throw new CorruptedFrameException( "Empty Packet!" );
}
--
2.26.1
2.25.1

14
BungeeCord-Patches/0045-Don-t-use-a-bytebuf-for-packet-decoding.patch
View File

@ -1,15 +1,15 @@
From ecf5ae72d3194c142b01b49746c67208c338a827 Mon Sep 17 00:00:00 2001
From d0addd4231eb0c95f4b8dcecce83a6d739667003 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
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
index 25ee2027..743d65e4 100644
index f297620c..c0d37142 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
@@ -17,8 +17,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
{
@@ -27,8 +27,7 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
in.markReaderIndex();
- final byte[] buf = new byte[ 3 ];
@ -18,7 +18,7 @@ index 25ee2027..743d65e4 100644
{
if ( !in.isReadable() )
{
@@ -26,10 +25,13 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
@@ -36,10 +35,13 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
return;
}
@ -35,7 +35,7 @@ index 25ee2027..743d65e4 100644
if ( false && length == 0) // Waterfall - ignore
{
throw new CorruptedFrameException( "Empty Packet!" );
@@ -39,26 +41,11 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
@@ -49,26 +51,11 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
{
in.resetReaderIndex();
return;
@ -67,5 +67,5 @@ index 25ee2027..743d65e4 100644
}
}
--
2.26.1
2.25.1

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

@ -1,4 +1,4 @@
From 8f9e65679651afff4a1feb974c76b532a09e821e Mon Sep 17 00:00:00 2001
From 9439649fae593bf183d39fa3337457ef60a91acf 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
@ -133,10 +133,10 @@ index 00000000..2583aa2c
+ }
+}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
index 71ddf022..6c3c7ab8 100644
index a2c72c9b..1a647f2b 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
@@ -71,7 +71,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@@ -78,7 +78,7 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
} else {
packetTypeStr = "unknown";
}
@ -167,5 +167,5 @@ index ac99d02c..0c1ecfb8 100644
// Waterfall start
--
2.26.2
2.25.1

67
BungeeCord-Patches/0057-Apply-SpigotMC-BungeeCord-2908-Don-t-frame-packets-f.patch
View File

@ -1,67 +0,0 @@
From 8126691800a7ed841c85871095dd29fbf2e2c90e Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Thu, 16 Jul 2020 15:23:20 -0400
Subject: [PATCH] Apply SpigotMC/BungeeCord#2908 (Don't frame packets for dead
connections)
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/LegacyDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/LegacyDecoder.java
index 334a8eab..5518bf26 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/LegacyDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/LegacyDecoder.java
@@ -14,6 +14,13 @@ public class LegacyDecoder extends ByteToMessageDecoder
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
{
+ // See check in Varint21FrameDecoder for more details
+ if ( !ctx.channel().isActive() )
+ {
+ in.skipBytes( in.readableBytes() );
+ return;
+ }
+
if ( !in.isReadable() )
{
return;
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 6c3c7ab8..1a647f2b 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
@@ -30,6 +30,13 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
{
+ // See Varint21FrameDecoder for the general reasoning. We add this here as ByteToMessageDecoder#handlerRemoved()
+ // will fire any cumulated data through the pipeline, so we want to try and stop it here.
+ if ( !ctx.channel().isActive() )
+ {
+ return;
+ }
+
Protocol.DirectionData prot = ( server ) ? protocol.TO_SERVER : protocol.TO_CLIENT;
ByteBuf slice = in.copy(); // Can't slice this one due to EntityMap :(
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
index 743d65e4..c0d37142 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
@@ -15,6 +15,16 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder
@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception
{
+ // If we decode an invalid packet and an exception is thrown (thus triggering a close of the connection),
+ // the Netty ByteToMessageDecoder will continue to frame more packets and potentially call fireChannelRead()
+ // on them, likely with more invalid packets. Therefore, check if the connection is no longer active and if so
+ // sliently discard the packet.
+ if ( !ctx.channel().isActive() )
+ {
+ in.skipBytes( in.readableBytes() );
+ return;
+ }
+
in.markReaderIndex();
for ( int i = 0; i < 3; i++ ) // Waterfall
--
2.26.2