Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2025-02-26 08:41:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge upstream - Minecraft 1.13-pre7 support

Browse Source
This commit is contained in:
BlackHole 2018-07-15 12:58:44 +02:00 committed by Jamie Mansfield
parent 8d79956adc
commit 6a77c81ac1
No known key found for this signature in database
GPG Key ID: 27F6918C0D47DF94
25 changed files with 202 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit ceb9ea1e52b0391a824a3a87c3e07e6db9ca178b Subproject commit 5cdb181cc51587386c13d2bfb5a034f72ccae126

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

@ -1,13 +1,13 @@
From f9b6981e2774ff0131de9a1d42ce3ff4396f93dc Mon Sep 17 00:00:00 2001 From 9c38dfae5a5a08ed736c5d9336b1d699a5511244 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 10:33:31 -0700 Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes Subject: [PATCH] POM Changes
- Require Java 8 - Require Java 8
- Deploy to destroystokyo mvn repo - Deploy to destroystokyo mvn repo
diff --git a/api/pom.xml b/api/pom.xml diff --git a/api/pom.xml b/api/pom.xml
index 96a46738..2a3c5eae 100644 index 5432a6eb..48bd8a54 100644
--- a/api/pom.xml --- a/api/pom.xml
+++ b/api/pom.xml +++ b/api/pom.xml
@@ -4,42 +4,42 @@ @@ -4,42 +4,42 @@
@ -18,7 +18,7 @@ index 96a46738..2a3c5eae 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -26,7 +26,7 @@ index 96a46738..2a3c5eae 100644
- <artifactId>bungeecord-api</artifactId> - <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId> + <artifactId>waterfall-api</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-API</name> - <name>BungeeCord-API</name>
@ -67,7 +67,7 @@ index 96a46738..2a3c5eae 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 9b5c98f7..7bc2dff7 100644 index 615ac3f5..ee76507c 100644
--- a/bootstrap/pom.xml --- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml +++ b/bootstrap/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -78,7 +78,7 @@ index 9b5c98f7..7bc2dff7 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -86,7 +86,7 @@ index 9b5c98f7..7bc2dff7 100644
- <artifactId>bungeecord-bootstrap</artifactId> - <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId> + <artifactId>waterfall-bootstrap</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name> - <name>BungeeCord-Bootstrap</name>
@ -142,7 +142,7 @@ index b7cb81e2..a4516ed9 100644
return; return;
} }
diff --git a/chat/pom.xml b/chat/pom.xml diff --git a/chat/pom.xml b/chat/pom.xml
index 970e3097..a908c13e 100644 index 92f04c62..31b98b7d 100644
--- a/chat/pom.xml --- a/chat/pom.xml
+++ b/chat/pom.xml +++ b/chat/pom.xml
@@ -4,23 +4,24 @@ @@ -4,23 +4,24 @@
@ -153,7 +153,7 @@ index 970e3097..a908c13e 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -161,7 +161,7 @@ index 970e3097..a908c13e 100644
- <artifactId>bungeecord-chat</artifactId> - <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId> + <artifactId>waterfall-chat</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-Chat</name> - <name>BungeeCord-Chat</name>
@ -179,7 +179,7 @@ index 970e3097..a908c13e 100644
<dependencies> <dependencies>
diff --git a/config/pom.xml b/config/pom.xml diff --git a/config/pom.xml b/config/pom.xml
index 255270c6..f4551e4c 100644 index 7241c6ba..bf7f5aeb 100644
--- a/config/pom.xml --- a/config/pom.xml
+++ b/config/pom.xml +++ b/config/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -190,7 +190,7 @@ index 255270c6..f4551e4c 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -198,7 +198,7 @@ index 255270c6..f4551e4c 100644
- <artifactId>bungeecord-config</artifactId> - <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId> + <artifactId>waterfall-config</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-Config</name> - <name>BungeeCord-Config</name>
@ -209,7 +209,7 @@ index 255270c6..f4551e4c 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/event/pom.xml b/event/pom.xml diff --git a/event/pom.xml b/event/pom.xml
index 6132e8e9..a387b2c0 100644 index 93c4aa39..e778b3d9 100644
--- a/event/pom.xml --- a/event/pom.xml
+++ b/event/pom.xml +++ b/event/pom.xml
@@ -4,17 +4,17 @@ @@ -4,17 +4,17 @@
@ -220,7 +220,7 @@ index 6132e8e9..a387b2c0 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -228,7 +228,7 @@ index 6132e8e9..a387b2c0 100644
- <artifactId>bungeecord-event</artifactId> - <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId> + <artifactId>waterfall-event</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-Event</name> - <name>BungeeCord-Event</name>
@ -237,7 +237,7 @@ index 6132e8e9..a387b2c0 100644
+ <description>Generic java event dispatching API intended for use with Waterfall.</description> + <description>Generic java event dispatching API intended for use with Waterfall.</description>
</project> </project>
diff --git a/log/pom.xml b/log/pom.xml diff --git a/log/pom.xml b/log/pom.xml
index 2fcbbad6..b54e01a0 100644 index 87b839ad..e24b3e40 100644
--- a/log/pom.xml --- a/log/pom.xml
+++ b/log/pom.xml +++ b/log/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -248,7 +248,7 @@ index 2fcbbad6..b54e01a0 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -256,7 +256,7 @@ index 2fcbbad6..b54e01a0 100644
- <artifactId>bungeecord-log</artifactId> - <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId> + <artifactId>waterfall-log</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-Log</name> - <name>BungeeCord-Log</name>
@ -278,7 +278,7 @@ index 2fcbbad6..b54e01a0 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 220f0421..2d81204b 100644 index 44d5b21e..db149339 100644
--- a/module/cmd-alert/pom.xml --- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -289,7 +289,7 @@ index 220f0421..2d81204b 100644
- <artifactId>bungeecord-module</artifactId> - <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId> + <artifactId>waterfall-module</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -297,11 +297,11 @@ index 220f0421..2d81204b 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId> - <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId> + <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 928f63a8..f22790a3 100644 index e320447a..c8d9826d 100644
--- a/module/cmd-find/pom.xml --- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -312,7 +312,7 @@ index 928f63a8..f22790a3 100644
- <artifactId>bungeecord-module</artifactId> - <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId> + <artifactId>waterfall-module</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -320,11 +320,11 @@ index 928f63a8..f22790a3 100644
- <artifactId>bungeecord-module-cmd-find</artifactId> - <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId> + <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 689b83ee..0e693f11 100644 index 230af0cc..461b26ee 100644
--- a/module/cmd-list/pom.xml --- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -335,7 +335,7 @@ index 689b83ee..0e693f11 100644
- <artifactId>bungeecord-module</artifactId> - <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId> + <artifactId>waterfall-module</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -343,11 +343,11 @@ index 689b83ee..0e693f11 100644
- <artifactId>bungeecord-module-cmd-list</artifactId> - <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId> + <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index e50a4bec..ba6de230 100644 index 23f9a02b..1b687b3c 100644
--- a/module/cmd-send/pom.xml --- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -358,7 +358,7 @@ index e50a4bec..ba6de230 100644
- <artifactId>bungeecord-module</artifactId> - <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId> + <artifactId>waterfall-module</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -366,11 +366,11 @@ index e50a4bec..ba6de230 100644
- <artifactId>bungeecord-module-cmd-send</artifactId> - <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId> + <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index daf146dc..e00697fe 100644 index 0731bd8e..9bdc3aba 100644
--- a/module/cmd-server/pom.xml --- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -381,7 +381,7 @@ index daf146dc..e00697fe 100644
- <artifactId>bungeecord-module</artifactId> - <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId> + <artifactId>waterfall-module</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -389,11 +389,11 @@ index daf146dc..e00697fe 100644
- <artifactId>bungeecord-module-cmd-server</artifactId> - <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId> + <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml diff --git a/module/pom.xml b/module/pom.xml
index aff2c070..2b827bb0 100644 index 107cb0ef..6bed2ea0 100644
--- a/module/pom.xml --- a/module/pom.xml
+++ b/module/pom.xml +++ b/module/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -404,7 +404,7 @@ index aff2c070..2b827bb0 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -412,7 +412,7 @@ index aff2c070..2b827bb0 100644
- <artifactId>bungeecord-module</artifactId> - <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId> + <artifactId>waterfall-module</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
- <name>BungeeCord Modules</name> - <name>BungeeCord Modules</name>
@ -441,7 +441,7 @@ index aff2c070..2b827bb0 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index 8e82446f..091ea8cf 100644 index 809cf79c..ca9a7c61 100644
--- a/module/reconnect-yaml/pom.xml --- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
@ -452,7 +452,7 @@ index 8e82446f..091ea8cf 100644
- <artifactId>bungeecord-module</artifactId> - <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId> + <artifactId>waterfall-module</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -460,11 +460,11 @@ index 8e82446f..091ea8cf 100644
- <artifactId>bungeecord-module-reconnect-yaml</artifactId> - <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId> + <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml diff --git a/native/pom.xml b/native/pom.xml
index 082f0908..8b045e3b 100644 index 15c0ada2..7073b404 100644
--- a/native/pom.xml --- a/native/pom.xml
+++ b/native/pom.xml +++ b/native/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -475,7 +475,7 @@ index 082f0908..8b045e3b 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -483,7 +483,7 @@ index 082f0908..8b045e3b 100644
- <artifactId>bungeecord-native</artifactId> - <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId> + <artifactId>waterfall-native</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-Native</name> - <name>BungeeCord-Native</name>
@ -494,7 +494,7 @@ index 082f0908..8b045e3b 100644
<dependencies> <dependencies>
<dependency> <dependency>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index e7cec244..2a1b0d82 100644 index 9cad53d8..79493df2 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -3,18 +3,25 @@ @@ -3,18 +3,25 @@
@ -512,7 +512,7 @@ index e7cec244..2a1b0d82 100644
+ +
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
- <name>BungeeCord-Parent</name> - <name>BungeeCord-Parent</name>
@ -679,7 +679,7 @@ index e7cec244..2a1b0d82 100644
+ </profiles> + </profiles>
</project> </project>
diff --git a/protocol/pom.xml b/protocol/pom.xml diff --git a/protocol/pom.xml b/protocol/pom.xml
index bf4b399a..9a4b6529 100644 index ab9868bd..333ae1e8 100644
--- a/protocol/pom.xml --- a/protocol/pom.xml
+++ b/protocol/pom.xml +++ b/protocol/pom.xml
@@ -4,24 +4,24 @@ @@ -4,24 +4,24 @@
@ -690,7 +690,7 @@ index bf4b399a..9a4b6529 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -698,7 +698,7 @@ index bf4b399a..9a4b6529 100644
- <artifactId>bungeecord-protocol</artifactId> - <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId> + <artifactId>waterfall-protocol</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-Protocol</name> - <name>BungeeCord-Protocol</name>
@ -716,7 +716,7 @@ index bf4b399a..9a4b6529 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index dcd6e5c4..0536e868 100644 index 6968ecb2..00eb9c5c 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -4,18 +4,18 @@ @@ -4,18 +4,18 @@
@ -727,7 +727,7 @@ index dcd6e5c4..0536e868 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -735,7 +735,7 @@ index dcd6e5c4..0536e868 100644
- <artifactId>bungeecord-proxy</artifactId> - <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId> + <artifactId>waterfall-proxy</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-Proxy</name> - <name>BungeeCord-Proxy</name>
@ -787,7 +787,7 @@ index dcd6e5c4..0536e868 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
diff --git a/query/pom.xml b/query/pom.xml diff --git a/query/pom.xml b/query/pom.xml
index 9ecb2612..4b3613fa 100644 index fdd44b20..4ae682ee 100644
--- a/query/pom.xml --- a/query/pom.xml
+++ b/query/pom.xml +++ b/query/pom.xml
@@ -4,19 +4,19 @@ @@ -4,19 +4,19 @@
@ -798,7 +798,7 @@ index 9ecb2612..4b3613fa 100644
- <artifactId>bungeecord-parent</artifactId> - <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -806,7 +806,7 @@ index 9ecb2612..4b3613fa 100644
- <artifactId>bungeecord-query</artifactId> - <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId> + <artifactId>waterfall-query</artifactId>
<version>1.12-SNAPSHOT</version> <version>1.13-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
- <name>BungeeCord-Query</name> - <name>BungeeCord-Query</name>
@ -828,5 +828,5 @@ index 9ecb2612..4b3613fa 100644
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
-- --
2.17.1 2.15.1.windows.2

8
BungeeCord-Patches/0002-Rename-references-from-BungeeCord-to-Waterfall.patch
View File

@ -1,4 +1,4 @@
From a88a7732ffba82dc21753d5cad9f5f1578f7c76e Mon Sep 17 00:00:00 2001 From df15b133f6533f222593d317b31350bc34dfc591 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 11:28:45 -0700 Date: Thu, 19 May 2016 11:28:45 -0700
Subject: [PATCH] Rename references from BungeeCord to Waterfall Subject: [PATCH] Rename references from BungeeCord to Waterfall
@ -53,7 +53,7 @@ index 9d51608d..446dfe2f 100644
while ( bungee.isRunning ) while ( bungee.isRunning )
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 2555348f..48194798 100644 index 8d6fc41e..71f30980 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -182,7 +182,7 @@ public class BungeeCord extends ProxyServer @@ -182,7 +182,7 @@ public class BungeeCord extends ProxyServer
@ -65,7 +65,7 @@ index 2555348f..48194798 100644
System.setSecurityManager( new BungeeSecurityManager() ); System.setSecurityManager( new BungeeSecurityManager() );
@@ -488,7 +488,7 @@ public class BungeeCord extends ProxyServer @@ -487,7 +487,7 @@ public class BungeeCord extends ProxyServer
@Override @Override
public String getName() public String getName()
{ {
@ -114,5 +114,5 @@ index 408312fd..95590b6d 100644
InetSocketAddress address = Util.getAddr( addr ); InetSocketAddress address = Util.getAddr( addr );
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted ); ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
-- --
2.16.1 2.15.1.windows.2

8
BungeeCord-Patches/0004-Configurable-Waterfall-Metrics.patch
View File

@ -1,4 +1,4 @@
From 49fc7e69aa3d6f00a7ba5fd920b05dbcba2b7cfb Mon Sep 17 00:00:00 2001 From ac53b2c6fa7cfe1db3b19cd476863505779ea486 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 10:55:20 -0700 Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Configurable Waterfall Metrics Subject: [PATCH] Configurable Waterfall Metrics
@ -46,10 +46,10 @@ index f9e277dc..056b8040 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 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 fca210cd..174a0d18 100644 index 084bc11e..e62b5259 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -299,7 +299,9 @@ public class BungeeCord extends ProxyServer @@ -298,7 +298,9 @@ public class BungeeCord extends ProxyServer
} }
} }
}, 0, TimeUnit.MINUTES.toMillis( 5 ) ); }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@ -82,5 +82,5 @@ index 95239878..e482e98c 100644
// Connect to the website // Connect to the website
URLConnection connection; URLConnection connection;
-- --
2.16.1 2.15.1.windows.2

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

@ -1,4 +1,4 @@
From fcc7a9df25e9acec9056283d51533eb12f059c85 Mon Sep 17 00:00:00 2001 From 40e9c66ff098c379778076921dc36f050e6b256a Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700 Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -6,19 +6,19 @@ Subject: [PATCH] Don't access a ByteBuf's underlying array
It returns the underlying array storage, and does *not* return a view of the buffer as an array It returns the underlying array storage, and does *not* return a view of the buffer as an array
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
index d578402b..756f7c2f 100644 index 8d4eacbc..04644236 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
@@ -2,6 +2,7 @@ package net.md_5.bungee.protocol.packet; @@ -3,6 +3,7 @@ package net.md_5.bungee.protocol.packet;
import com.google.common.base.Function;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
+import io.netty.buffer.ByteBufUtil; +import io.netty.buffer.ByteBufUtil;
import net.md_5.bungee.protocol.DefinedPacket; import net.md_5.bungee.protocol.DefinedPacket;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@@ -29,10 +30,23 @@ public class PluginMessage extends DefinedPacket @@ -56,10 +57,23 @@ public class PluginMessage extends DefinedPacket
return ( input.getTag().equals( "REGISTER" ) || input.getTag().equals( "MC|Brand" ) ) && input.getData().length < Byte.MAX_VALUE; return ( input.getTag().equals( "REGISTER" ) || input.getTag().equals( "minecraft:register" ) || input.getTag().equals( "MC|Brand" ) || input.getTag().equals( "minecraft:brand" ) ) && input.getData().length < Byte.MAX_VALUE;
} }
}; };
- // - //
@ -43,23 +43,23 @@ index d578402b..756f7c2f 100644
* Allow this packet to be sent as an "extended" packet. * 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 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 b34247ce..67a6d247 100644 index d81cda98..29245c94 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -201,7 +201,7 @@ public class ServerConnector extends PacketHandler @@ -214,7 +214,7 @@ public class ServerConnector extends PacketHandler
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand ); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
- user.unsafe().sendPacket( new PluginMessage( "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler.isServerForge() ) ); - user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", DefinedPacket.toArray( brand ), handshakeHandler.isServerForge() ) );
+ user.unsafe().sendPacket( new PluginMessage( "MC|Brand", brand, handshakeHandler.isServerForge() ) ); + user.unsafe().sendPacket( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand", brand, handshakeHandler.isServerForge() ) );
brand.release(); brand.release();
user.setDimension( login.getDimension() ); user.setDimension( login.getDimension() );
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java 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 931f3f30..9ea61319 100644 index 842425bb..51c78e2e 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -241,7 +241,7 @@ public class DownstreamBridge extends PacketHandler @@ -242,7 +242,7 @@ public class DownstreamBridge extends PacketHandler
brand = ByteBufAllocator.DEFAULT.heapBuffer(); brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand ); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@ -86,5 +86,5 @@ index 551ae1e1..be9685b9 100644
{ {
@Override @Override
-- --
2.17.0.windows.1 2.15.1.windows.2

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

@ -1,4 +1,4 @@
From e8b04bb099af854160b469e372d2553f63c2c7b6 Mon Sep 17 00:00:00 2001 From b43d08b7902582353ae35d4b281749e2e3471a76 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700 Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions Subject: [PATCH] Optimize uuid conversions
@ -258,10 +258,10 @@ index 27b51849..8bf17f9c 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 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 1c65e002..59216860 100644 index e5d361e3..d1e9d556 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -601,7 +601,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -618,7 +618,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override @Override
public String getUUID() public String getUUID()
{ {
@ -271,5 +271,5 @@ index 1c65e002..59216860 100644
@Override @Override
-- --
2.16.1 2.15.1.windows.2

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

@ -1,4 +1,4 @@
From 8a8bc18e03611469f038d8a3cb57498dc539d045 Mon Sep 17 00:00:00 2001 From 478b783a5131e16a5e565cff118c15be6cc8f8d7 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk> From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400 Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled 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. 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 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 8194dbde..6c367c73 100644 index 29245c94..ee8cdff2 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -3,6 +3,7 @@ package net.md_5.bungee; @@ -3,6 +3,7 @@ package net.md_5.bungee;
@ -23,7 +23,7 @@ index 8194dbde..6c367c73 100644
import java.util.Queue; import java.util.Queue;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@@ -94,15 +95,39 @@ public class ServerConnector extends PacketHandler @@ -98,15 +99,39 @@ public class ServerConnector extends PacketHandler
String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID(); String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID();
LoginResult profile = user.getPendingConnection().getLoginProfile(); LoginResult profile = user.getPendingConnection().getLoginProfile();
@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
* The FML 1.8 handshake token. * The FML 1.8 handshake token.
*/ */
-- --
2.16.1 2.15.1.windows.2

8
BungeeCord-Patches/0013-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch
View File

@ -1,14 +1,14 @@
From 21915cbd51f2633b3b71c3e784f634d04fd2c081 Mon Sep 17 00:00:00 2001 From dfdf0c885ff79cac405144f524a257be0137ce1d Mon Sep 17 00:00:00 2001
From: Iceee <andrew@optic.tv> From: Iceee <andrew@optic.tv>
Date: Mon, 6 Jul 2015 18:59:29 -0500 Date: Mon, 6 Jul 2015 18:59:29 -0500
Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 6a4cc14c..b9cf1ee2 100644 index 8a4f747c..cfc3991f 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -329,6 +329,8 @@ public class BungeeCord extends ProxyServer @@ -328,6 +328,8 @@ public class BungeeCord extends ProxyServer
new ServerBootstrap() new ServerBootstrap()
.channel( PipelineUtils.getServerChannel() ) .channel( PipelineUtils.getServerChannel() )
.option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere! .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
@ -18,5 +18,5 @@ index 6a4cc14c..b9cf1ee2 100644
.childHandler( PipelineUtils.SERVER_CHILD ) .childHandler( PipelineUtils.SERVER_CHILD )
.group( eventLoops ) .group( eventLoops )
-- --
2.16.1 2.15.1.windows.2

14
BungeeCord-Patches/0016-Micro-optimizations.patch
View File

@ -1,4 +1,4 @@
From 9553db26ff87855c70317e4ca59f4d5213fb13ae Mon Sep 17 00:00:00 2001 From 3f1783a2c23871117ecd7bebbc719a791f2f6b27 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com> From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700 Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations Subject: [PATCH] Micro-optimizations
@ -31,10 +31,10 @@ index 096538a7..54a65155 100644
if ( split.length == 0 ) if ( split.length == 0 )
{ {
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 b9cf1ee2..fcdc8967 100644 index cfc3991f..ae8fd627 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -521,7 +521,9 @@ public class BungeeCord extends ProxyServer @@ -520,7 +520,9 @@ public class BungeeCord extends ProxyServer
String translation = "<translation '" + name + "' missing>"; String translation = "<translation '" + name + "' missing>";
try try
{ {
@ -59,10 +59,10 @@ index 2daaf999..bc1227a5 100644
@Override @Override
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 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 9ea61319..565e6b0e 100644 index 51c78e2e..23417849 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -223,7 +223,6 @@ public class DownstreamBridge extends PacketHandler @@ -224,7 +224,6 @@ public class DownstreamBridge extends PacketHandler
@Override @Override
public void handle(PluginMessage pluginMessage) throws Exception public void handle(PluginMessage pluginMessage) throws Exception
{ {
@ -70,7 +70,7 @@ index 9ea61319..565e6b0e 100644
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() ); PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() ) if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -250,6 +249,7 @@ public class DownstreamBridge extends PacketHandler @@ -251,6 +250,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) ) if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{ {
@ -79,5 +79,5 @@ index 9ea61319..565e6b0e 100644
String subChannel = in.readUTF(); String subChannel = in.readUTF();
-- --
2.16.1 2.15.1.windows.2

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

@ -1,4 +1,4 @@
From 62da2c1697d08e1e68415ac453a0391c0a58e6f8 Mon Sep 17 00:00:00 2001 From 2c0151ec567571dbd5b34c554bf18d9b88fe796d Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600 Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers 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 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 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 e7cb3803..447eaae7 100644 index ea44573d..5b32effe 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
+++ b/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> @@ -16,6 +16,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -37,10 +37,10 @@ index e7cb3803..447eaae7 100644
{ {
packet.read( in, prot.getDirection(), protocolVersion ); packet.read( in, prot.getDirection(), protocolVersion );
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java 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 cd065631..3f6b1766 100644 index 76c2bea0..96d3c99e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -360,14 +360,23 @@ public enum Protocol @@ -397,14 +397,23 @@ public enum Protocol
return protocol; return protocol;
} }
@ -66,20 +66,20 @@ index cd065631..3f6b1766 100644
throw new BadPacketException( "Packet with id " + id + " outside of range " ); 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 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 6c367c73..6df62b22 100644 index ee8cdff2..44821171 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -30,7 +30,9 @@ import net.md_5.bungee.forge.ForgeUtils; @@ -31,7 +31,9 @@ import net.md_5.bungee.forge.ForgeUtils;
import net.md_5.bungee.netty.ChannelWrapper; import net.md_5.bungee.netty.ChannelWrapper;
import net.md_5.bungee.netty.HandlerBoss; import net.md_5.bungee.netty.HandlerBoss;
import net.md_5.bungee.netty.PacketHandler; import net.md_5.bungee.netty.PacketHandler;
+import net.md_5.bungee.netty.PipelineUtils; +import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.DefinedPacket; import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.MinecraftDecoder; +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.Protocol;
import net.md_5.bungee.protocol.packet.EncryptionRequest; import net.md_5.bungee.protocol.ProtocolConstants;
import net.md_5.bungee.protocol.packet.Handshake; @@ -198,6 +200,12 @@ public class ServerConnector extends PacketHandler
@@ -185,6 +187,12 @@ public class ServerConnector extends PacketHandler
ServerConnection server = new ServerConnection( ch, target ); ServerConnection server = new ServerConnection( ch, target );
ServerConnectedEvent event = new ServerConnectedEvent( user, server ); ServerConnectedEvent event = new ServerConnectedEvent( user, server );
@ -91,7 +91,7 @@ index 6c367c73..6df62b22 100644
+ +
bungee.getPluginManager().callEvent( event ); bungee.getPluginManager().callEvent( event );
ch.write( BungeeCord.getInstance().registerChannels() ); 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 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 bc1227a5..61502ea8 100644 index bc1227a5..61502ea8 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@ -105,10 +105,10 @@ index bc1227a5..61502ea8 100644
@Getter @Getter
@NonNull @NonNull
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java 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 847a3eca..27ee21f2 100644 index cae566f5..bad9773b 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -211,6 +211,12 @@ public abstract class EntityMap @@ -264,6 +264,12 @@ public abstract class EntityMap
int packetId = DefinedPacket.readVarInt( packet ); int packetId = DefinedPacket.readVarInt( packet );
int packetIdLength = packet.readerIndex() - readerIndex; int packetIdLength = packet.readerIndex() - readerIndex;
@ -122,5 +122,5 @@ index 847a3eca..27ee21f2 100644
{ {
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength ); rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
-- --
2.16.1 2.15.1.windows.2

22
BungeeCord-Patches/0021-Optional-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 39ee1270efb5adc9ff6e38b7e50824b5cda6d97d Mon Sep 17 00:00:00 2001 From d1f44b716a78cdd29ddc056b4f717872e86c0909 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de> From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100 Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging. Subject: [PATCH] Optional server list ping logging.
@ -61,10 +61,10 @@ index e56d3591..68f25460 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 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 68fef8a4..817ec3e1 100644 index 44821171..47904de1 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -392,6 +392,6 @@ public class ServerConnector extends PacketHandler @@ -405,6 +405,6 @@ public class ServerConnector extends PacketHandler
@Override @Override
public String toString() public String toString()
{ {
@ -73,10 +73,10 @@ index 68fef8a4..817ec3e1 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 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 565e6b0e..085a4e60 100644 index 23417849..b5a4a929 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -511,6 +511,6 @@ public class DownstreamBridge extends PacketHandler @@ -518,6 +518,6 @@ public class DownstreamBridge extends PacketHandler
@Override @Override
public String toString() public String toString()
{ {
@ -85,10 +85,10 @@ index 565e6b0e..085a4e60 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 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 59216860..1c764f52 100644 index d1e9d556..59053de2 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -282,19 +282,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -293,19 +293,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
} }
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() ); this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
@ -112,7 +112,7 @@ index 59216860..1c764f52 100644
thisState = State.USERNAME; thisState = State.USERNAME;
ch.setProtocol( Protocol.LOGIN ); ch.setProtocol( Protocol.LOGIN );
@@ -607,7 +610,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -624,7 +627,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override @Override
public String toString() public String toString()
{ {
@ -122,10 +122,10 @@ index 59216860..1c764f52 100644
@Override @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 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 6d0eb7e9..9fb20de1 100644 index af1c7deb..81f09a80 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -241,6 +241,6 @@ public class UpstreamBridge extends PacketHandler @@ -246,6 +246,6 @@ public class UpstreamBridge extends PacketHandler
@Override @Override
public String toString() public String toString()
{ {
@ -134,5 +134,5 @@ index 6d0eb7e9..9fb20de1 100644
} }
} }
-- --
2.17.0.windows.1 2.15.1.windows.2

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

@ -1,4 +1,4 @@
From ec155caf85fc6f5ef2f152733055ee2215b2e666 Mon Sep 17 00:00:00 2001 From da9d5c3de73f4bcad92c4f5ab1968fd6db4d5da2 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Sun, 7 Feb 2016 00:01:19 -0700 Date: Sun, 7 Feb 2016 00:01:19 -0700
Subject: [PATCH] Add a property to accept invalid ping packets 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 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 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 1c764f52..ba3d5204 100644 index 59053de2..933a8388 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -248,10 +248,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -259,10 +259,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
thisState = State.PING; thisState = State.PING;
} }
@ -29,5 +29,5 @@ index 1c764f52..ba3d5204 100644
disconnect( "" ); disconnect( "" );
} }
-- --
2.16.3 2.15.1.windows.2

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

@ -1,4 +1,4 @@
From 0449711c6f75a43eac964254b8e8fa6cab2d3bc9 Mon Sep 17 00:00:00 2001 From cb834674c3d51f0d3c27da698f0e3c82962fa3ee Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com> From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700 Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group. Subject: [PATCH] Use a worker and a boss event loop group.
@ -8,7 +8,7 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
This is proper practice for netty. 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 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 fcdc8967..14555472 100644 index ae8fd627..ebcc37c2 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer @@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer
@ -20,7 +20,7 @@ index fcdc8967..14555472 100644
/** /**
* locations.yml save thread. * locations.yml save thread.
*/ */
@@ -255,7 +255,8 @@ public class BungeeCord extends ProxyServer @@ -254,7 +254,8 @@ public class BungeeCord extends ProxyServer
ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance ResourceLeakDetector.setLevel( ResourceLeakDetector.Level.DISABLED ); // Eats performance
} }
@ -30,7 +30,7 @@ index fcdc8967..14555472 100644
File moduleDirectory = new File( "modules" ); File moduleDirectory = new File( "modules" );
moduleManager.load( this, moduleDirectory ); moduleManager.load( this, moduleDirectory );
@@ -333,7 +334,7 @@ public class BungeeCord extends ProxyServer @@ -332,7 +333,7 @@ public class BungeeCord extends ProxyServer
.childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 ) .childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 )
.childAttr( PipelineUtils.LISTENER, info ) .childAttr( PipelineUtils.LISTENER, info )
.childHandler( PipelineUtils.SERVER_CHILD ) .childHandler( PipelineUtils.SERVER_CHILD )
@ -39,7 +39,7 @@ index fcdc8967..14555472 100644
.localAddress( info.getHost() ) .localAddress( info.getHost() )
.bind().addListener( listener ); .bind().addListener( listener );
@@ -354,7 +355,7 @@ public class BungeeCord extends ProxyServer @@ -353,7 +354,7 @@ public class BungeeCord extends ProxyServer
} }
} }
}; };
@ -48,7 +48,7 @@ index fcdc8967..14555472 100644
} }
} }
} }
@@ -449,12 +450,14 @@ public class BungeeCord extends ProxyServer @@ -448,12 +449,14 @@ public class BungeeCord extends ProxyServer
} }
getLogger().info( "Closing IO threads" ); getLogger().info( "Closing IO threads" );
@ -83,5 +83,5 @@ index 9756c09c..648cd273 100644
.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
.remoteAddress( getAddress() ) .remoteAddress( getAddress() )
-- --
2.16.1 2.15.1.windows.2

8
BungeeCord-Patches/0026-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch
View File

@ -1,4 +1,4 @@
From 8aed545ad60c51be4fd1693292c0a6717c101508 Mon Sep 17 00:00:00 2001 From b718071e9c176cc2f6cd7f097345b5c302be10a3 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Mon, 25 Apr 2016 23:46:00 -0700 Date: Mon, 25 Apr 2016 23:46:00 -0700
Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same
@ -167,7 +167,7 @@ index 00000000..a1b6981e
+ } + }
+} +}
diff --git a/api/src/main/java/net/md_5/bungee/api/score/Team.java b/api/src/main/java/net/md_5/bungee/api/score/Team.java diff --git a/api/src/main/java/net/md_5/bungee/api/score/Team.java b/api/src/main/java/net/md_5/bungee/api/score/Team.java
index 41660371..f0f019bc 100644 index 849ba1cf..25526320 100644
--- a/api/src/main/java/net/md_5/bungee/api/score/Team.java --- a/api/src/main/java/net/md_5/bungee/api/score/Team.java
+++ b/api/src/main/java/net/md_5/bungee/api/score/Team.java +++ b/api/src/main/java/net/md_5/bungee/api/score/Team.java
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
@ -189,7 +189,7 @@ index 41660371..f0f019bc 100644
@@ -20,7 +21,7 @@ public class Team @@ -20,7 +21,7 @@ public class Team
private String nameTagVisibility; private String nameTagVisibility;
private String collisionRule; private String collisionRule;
private byte color; private int color;
- private Set<String> players = new HashSet<>(); - private Set<String> players = new HashSet<>();
+ private Set<String> players = LowMemorySet.create(); + private Set<String> players = LowMemorySet.create();
@ -267,5 +267,5 @@ index 00000000..5aa306a1
+ +
+} +}
-- --
2.14.1 2.15.1.windows.2

8
BungeeCord-Patches/0027-Better-debug-checks.patch
View File

@ -1,14 +1,14 @@
From 0e83cd9e923f0b05a17feab69dd80b244ee84373 Mon Sep 17 00:00:00 2001 From e25b383744ba5d85ced3770a20497b0252f25cce Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Wed, 6 Apr 2016 23:46:00 -0700 Date: Wed, 6 Apr 2016 23:46:00 -0700
Subject: [PATCH] Better debug checks Subject: [PATCH] Better debug checks
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 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 3f6b1766..a568d472 100644 index 96d3c99e..da53ff0f 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -433,7 +433,7 @@ public enum Protocol @@ -470,7 +470,7 @@ public enum Protocol
{ {
throw new BadPacketException( "Unsupported protocol version" ); throw new BadPacketException( "Unsupported protocol version" );
} }
@ -18,5 +18,5 @@ index 3f6b1766..a568d472 100644
return protocolData.packetMap.get( packet ); return protocolData.packetMap.get( packet );
} }
-- --
2.16.1 2.15.1.windows.2

10
BungeeCord-Patches/0028-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From 554c73d20389ff56690fcb82bf8eb5f00ba78d5d Mon Sep 17 00:00:00 2001 From fa6c047a48e2917f443c8c1880b1da954f5c45b5 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200 Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api. Subject: [PATCH] Add dynamic server addition/removal api.
@ -96,7 +96,7 @@ index 5a49050a..f04e2bf4 100644
* Does the server authenticate with mojang * Does the server authenticate with mojang
*/ */
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
index ccc8153f..1351941a 100644 index baae54f6..ccfefd26 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java --- a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java +++ b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
@@ -93,9 +93,25 @@ public abstract class ProxyServer @@ -93,9 +93,25 @@ public abstract class ProxyServer
@ -157,10 +157,10 @@ index 416c54e3..920b9b36 100644
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase(); private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase();
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 14555472..af84795f 100644 index ebcc37c2..d347d42d 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -597,10 +597,18 @@ public class BungeeCord extends ProxyServer @@ -596,10 +596,18 @@ public class BungeeCord extends ProxyServer
return config.getServers(); return config.getServers();
} }
@ -298,5 +298,5 @@ index 3a73a870..d3f0b2d8 100644
+ // Waterfall end + // Waterfall end
} }
-- --
2.16.1 2.15.1.windows.2

10
BungeeCord-Patches/0029-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch
View File

@ -1,14 +1,14 @@
From 02f89ab7ae7b288cc0fbd2494b7a7bfb90330ce6 Mon Sep 17 00:00:00 2001 From 74d52d182c77622b4c017eae70d3cc729254f095 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net> From: Techcable <Techcable@techcable.net>
Date: Mon, 6 Jun 2016 13:36:10 -0600 Date: Mon, 6 Jun 2016 13:36:10 -0600
Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state
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 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 ba3d5204..14929879 100644 index 933a8388..65e57062 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -267,7 +267,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -278,7 +278,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
this.handshake = handshake; this.handshake = handshake;
ch.setVersion( handshake.getProtocolVersion() ); ch.setVersion( handshake.getProtocolVersion() );
@ -17,7 +17,7 @@ index ba3d5204..14929879 100644
// with Bungee's IP forwarding, so we detect it, and remove it from the host string, for now. // with Bungee's IP forwarding, so we detect it, and remove it from the host string, for now.
// We know FML appends \00FML\00. However, we need to also consider that other systems might // We know FML appends \00FML\00. However, we need to also consider that other systems might
// add their own data to the end of the string. So, we just take everything from the \0 character // add their own data to the end of the string. So, we just take everything from the \0 character
@@ -548,7 +548,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -565,7 +565,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override @Override
public void disconnect(final BaseComponent... reason) public void disconnect(final BaseComponent... reason)
{ {
@ -27,5 +27,5 @@ index ba3d5204..14929879 100644
ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) ); ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) );
} else } else
-- --
2.16.3 2.15.1.windows.2

16
BungeeCord-Patches/0030-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From dd1d2c326ff05dd227612b43a7dc72f7cafd47bd Mon Sep 17 00:00:00 2001 From c56baacce93328c48858f69df3d23bdec36b7a15 Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io> From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500 Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent Subject: [PATCH] Improve ServerKickEvent
@ -62,10 +62,10 @@ index 0e1ef5c4..ee63732d 100644
@Deprecated @Deprecated
public String getKickReason() public String getKickReason()
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java 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 972c70ec..1213c206 100644 index 47904de1..0937c39d 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -315,7 +315,7 @@ public class ServerConnector extends PacketHandler @@ -328,7 +328,7 @@ public class ServerConnector extends PacketHandler
public void handle(Kick kick) throws Exception public void handle(Kick kick) throws Exception
{ {
ServerInfo def = user.updateAndGetNextServer( target ); ServerInfo def = user.updateAndGetNextServer( target );
@ -75,7 +75,7 @@ index 972c70ec..1213c206 100644
{ {
// Pre cancel the event if we are going to try another server // 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 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 085a4e60..c6da6c47 100644 index b5a4a929..921605ab 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions; @@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
@ -86,7 +86,7 @@ index 085a4e60..c6da6c47 100644
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
@@ -60,16 +61,19 @@ public class DownstreamBridge extends PacketHandler @@ -61,16 +62,19 @@ public class DownstreamBridge extends PacketHandler
return; return;
} }
@ -111,7 +111,7 @@ index 085a4e60..c6da6c47 100644
} }
@Override @Override
@@ -84,7 +88,19 @@ public class DownstreamBridge extends PacketHandler @@ -85,7 +89,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() ) if ( !server.isObsolete() )
{ {
@ -132,7 +132,7 @@ index 085a4e60..c6da6c47 100644
} }
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() ); ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -455,7 +471,11 @@ public class DownstreamBridge extends PacketHandler @@ -456,7 +472,11 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception public void handle(Kick kick) throws Exception
{ {
ServerInfo def = con.updateAndGetNextServer( server.getInfo() ); ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@ -146,5 +146,5 @@ index 085a4e60..c6da6c47 100644
{ {
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT ); con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
-- --
2.16.3 2.15.1.windows.2

8
BungeeCord-Patches/0031-Configurable-server-version-in-ping-response.patch
View File

@ -1,4 +1,4 @@
From 16f5603904b7ec61c3982d44b08f2a9e0541f81e Mon Sep 17 00:00:00 2001 From 54013d2709efdb3738c486ad4cdfcb2cd69da490 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me> From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500 Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response Subject: [PATCH] Configurable server version in ping response
@ -59,10 +59,10 @@ index 68f25460..59835815 100644
@Override @Override
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 af84795f..6ddb2cb7 100644 index d347d42d..09d53fea 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -646,7 +646,7 @@ public class BungeeCord extends ProxyServer @@ -650,7 +650,7 @@ public class BungeeCord extends ProxyServer
@Override @Override
public String getGameVersion() public String getGameVersion()
{ {
@ -72,5 +72,5 @@ index af84795f..6ddb2cb7 100644
@Override @Override
-- --
2.16.1 2.15.1.windows.2

32
BungeeCord-Patches/0035-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,11 +1,11 @@
From 58fd8c6129c3d7a113d43f5afec755f6dee0d334 Mon Sep 17 00:00:00 2001 From d8fe24fd088efb4c1d5201f39f3ab892d7c62315 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com> From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200 Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9 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 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 6f782c8f..2d5fc487 100644 index 93f324e2..0e81b43c 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
@ -17,8 +17,8 @@ index 6f782c8f..2d5fc487 100644
import net.md_5.bungee.protocol.packet.KeepAlive; import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.ClientSettings; import net.md_5.bungee.protocol.packet.ClientSettings;
import net.md_5.bungee.protocol.packet.ClientStatus; import net.md_5.bungee.protocol.packet.ClientStatus;
@@ -148,4 +150,13 @@ public abstract class AbstractPacketHandler @@ -158,4 +160,13 @@ public abstract class AbstractPacketHandler
public void handle(BossBar bossBar) throws Exception public void handle(LoginPayloadResponse response) throws Exception
{ {
} }
+ // Waterfall start + // Waterfall start
@ -32,7 +32,7 @@ index 6f782c8f..2d5fc487 100644
+ // Waterfall end + // 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 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 a568d472..97aacd00 100644 index da53ff0f..82e9a1d6 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat; @@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;
@ -44,9 +44,9 @@ index a568d472..97aacd00 100644
import net.md_5.bungee.protocol.packet.Handshake; import net.md_5.bungee.protocol.packet.Handshake;
import net.md_5.bungee.protocol.packet.KeepAlive; import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick; import net.md_5.bungee.protocol.packet.Kick;
@@ -87,6 +89,24 @@ public enum Protocol @@ -94,6 +96,26 @@ public enum Protocol
map( ProtocolConstants.MINECRAFT_1_9, 0x0C ), map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
map( ProtocolConstants.MINECRAFT_1_12, 0x0C ) map( ProtocolConstants.MINECRAFT_1_13, 0x0C )
); );
+ // Waterfall start + // Waterfall start
+ TO_CLIENT.registerPacket( + TO_CLIENT.registerPacket(
@ -56,14 +56,16 @@ index a568d472..97aacd00 100644
+ map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B), + map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B),
+ map(ProtocolConstants.MINECRAFT_1_10, 0x4B), + map(ProtocolConstants.MINECRAFT_1_10, 0x4B),
+ map(ProtocolConstants.MINECRAFT_1_12, 0x4E), + map(ProtocolConstants.MINECRAFT_1_12, 0x4E),
+ map(ProtocolConstants.MINECRAFT_1_12_1, 0x4F) + map(ProtocolConstants.MINECRAFT_1_12_1, 0x4F),
+ map(ProtocolConstants.MINECRAFT_1_13, 0x53)
+ ); + );
+ TO_CLIENT.registerPacket( + TO_CLIENT.registerPacket(
+ EntityRemoveEffect.class, + EntityRemoveEffect.class,
+ map(ProtocolConstants.MINECRAFT_1_8, 0x1E), + map(ProtocolConstants.MINECRAFT_1_8, 0x1E),
+ map(ProtocolConstants.MINECRAFT_1_9, 0x31), + map(ProtocolConstants.MINECRAFT_1_9, 0x31),
+ map(ProtocolConstants.MINECRAFT_1_12, 0x32), + map(ProtocolConstants.MINECRAFT_1_12, 0x32),
+ map(ProtocolConstants.MINECRAFT_1_12_1, 0x33) + map(ProtocolConstants.MINECRAFT_1_12_1, 0x33),
+ map(ProtocolConstants.MINECRAFT_1_13, 0x36)
+ ); + );
+ // Waterfall end + // Waterfall end
TO_CLIENT.registerPacket( TO_CLIENT.registerPacket(
@ -188,19 +190,19 @@ index 8344a9b6..ef12a019 100644
@Getter @Getter
private String displayName; private String displayName;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java 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 c6da6c47..1edb9439 100644 index 921605ab..287a42bd 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -32,6 +32,8 @@ import net.md_5.bungee.netty.PacketHandler; @@ -33,6 +33,8 @@ import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.DefinedPacket;
import net.md_5.bungee.protocol.PacketWrapper; import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.ProtocolConstants;
import net.md_5.bungee.protocol.packet.BossBar; import net.md_5.bungee.protocol.packet.BossBar;
+import net.md_5.bungee.protocol.packet.EntityEffect; +import net.md_5.bungee.protocol.packet.EntityEffect;
+import net.md_5.bungee.protocol.packet.EntityRemoveEffect; +import net.md_5.bungee.protocol.packet.EntityRemoveEffect;
import net.md_5.bungee.protocol.packet.KeepAlive; import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.PlayerListItem; import net.md_5.bungee.protocol.packet.PlayerListItem;
import net.md_5.bungee.protocol.packet.Respawn; import net.md_5.bungee.protocol.packet.Respawn;
@@ -522,6 +524,32 @@ public class DownstreamBridge extends PacketHandler @@ -529,6 +531,32 @@ public class DownstreamBridge extends PacketHandler
} }
} }
@ -271,5 +273,5 @@ index 0d683856..c1272da3 100644
* Sends the server mod list to the client, or stores it for sending later. * Sends the server mod list to the client, or stores it for sending later.
* *
-- --
2.17.0.windows.1 2.15.1.windows.2

18
BungeeCord-Patches/0040-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From 838c64762f41da5e8e81fe8cb973edc24a19b2db Mon Sep 17 00:00:00 2001 From 86114fe2b34ce641430a7bbd18e6acb99b46101f Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net> From: Minecrell <dev@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200 Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for 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 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 7bc2dff7..6e8dd81e 100644 index ee76507c..e7bc7a5d 100644
--- a/bootstrap/pom.xml --- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml +++ b/bootstrap/pom.xml
@@ -80,7 +80,17 @@ @@ -80,7 +80,17 @@
@ -52,7 +52,7 @@ index 2efe7211..3e719f6e 100644
} }
diff --git a/log4j/pom.xml b/log4j/pom.xml diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644 new file mode 100644
index 00000000..78045e1d index 00000000..e49c948f
--- /dev/null --- /dev/null
+++ b/log4j/pom.xml +++ b/log4j/pom.xml
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
@ -63,13 +63,13 @@ index 00000000..78045e1d
+ <parent> + <parent>
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId> + <artifactId>waterfall-parent</artifactId>
+ <version>1.12-SNAPSHOT</version> + <version>1.13-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath>
+ </parent> + </parent>
+ +
+ <groupId>io.github.waterfallmc</groupId> + <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log4j</artifactId> + <artifactId>waterfall-log4j</artifactId>
+ <version>1.12-SNAPSHOT</version> + <version>1.13-SNAPSHOT</version>
+ <packaging>jar</packaging> + <packaging>jar</packaging>
+ +
+ <name>Waterfall-Log</name> + <name>Waterfall-Log</name>
@ -249,7 +249,7 @@ index 00000000..d4a81199
+ </Loggers> + </Loggers>
+</Configuration> +</Configuration>
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 2a1b0d82..87ad1500 100644 index 79493df2..0183bf9c 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -56,6 +56,7 @@ @@ -56,6 +56,7 @@
@ -261,7 +261,7 @@ index 2a1b0d82..87ad1500 100644
<module>protocol</module> <module>protocol</module>
<module>proxy</module> <module>proxy</module>
diff --git a/proxy/pom.xml b/proxy/pom.xml diff --git a/proxy/pom.xml b/proxy/pom.xml
index 1c22043b..e34e3b54 100644 index 03708968..bb15d274 100644
--- a/proxy/pom.xml --- a/proxy/pom.xml
+++ b/proxy/pom.xml +++ b/proxy/pom.xml
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
@ -395,7 +395,7 @@ index 00000000..6cfe283a
+ +
+} +}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java 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 6ddb2cb7..22ebfe44 100644 index 09d53fea..47d4c585 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@ -506,5 +506,5 @@ index 10366c88..8c5cc949 100644
} }
-- --
2.16.1 2.18.0

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

@ -1,4 +1,4 @@
From 11629f33a3756606d47546784605aa3a7ae7fb41 Mon Sep 17 00:00:00 2001 From 0945d31d4f5b083d5d1177fb9b916f154e6968f5 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net> From: Minecrell <dev@minecrell.net>
Date: Sun, 24 Sep 2017 12:06:49 +0200 Date: Sun, 24 Sep 2017 12:06:49 +0200
Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord
@ -47,5 +47,5 @@ index 00000000..bf132953
+ </Loggers> + </Loggers>
+</Configuration> +</Configuration>
-- --
2.14.3 2.18.0

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

@ -1,4 +1,4 @@
From 97a884f769d667547d3398d81aac496740aa8fe4 Mon Sep 17 00:00:00 2001 From 13c39323880b63ffdb0cf700560ac6e60dc2055a Mon Sep 17 00:00:00 2001
From: phenomax <phenomax@revayd.net> From: phenomax <phenomax@revayd.net>
Date: Thu, 10 Aug 2017 18:41:17 +0200 Date: Thu, 10 Aug 2017 18:41:17 +0200
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@ -52,10 +52,10 @@ similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java rename 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 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 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 14929879..88b9a18c 100644 index 65e57062..2347654c 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -536,7 +536,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -547,7 +547,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}; };
// fire login event // fire login event
@ -65,5 +65,5 @@ index 14929879..88b9a18c 100644
@Override @Override
-- --
2.16.3 2.15.1.windows.2

8
BungeeCord-Patches/0046-Optionally-log-InitialHandler-connections.patch
View File

@ -1,4 +1,4 @@
From 24a81a16c1096e60dcadbf0ddd89d24793608294 Mon Sep 17 00:00:00 2001 From 3856ab186008bdc544e574f8f332b1a9576b910a Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com> From: Gabriele C <sgdc3.mail@gmail.com>
Date: Thu, 8 Feb 2018 19:10:52 +0100 Date: Thu, 8 Feb 2018 19:10:52 +0100
Subject: [PATCH] Optionally log InitialHandler connections Subject: [PATCH] Optionally log InitialHandler connections
@ -57,10 +57,10 @@ index 7dc3c2d9..5ba15771 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 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 88b9a18c..1accd61d 100644 index 2347654c..c6e109c5 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -301,7 +301,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -312,7 +312,9 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break; break;
case 2: case 2:
// Login // Login
@ -72,5 +72,5 @@ index 88b9a18c..1accd61d 100644
ch.setProtocol( Protocol.LOGIN ); ch.setProtocol( Protocol.LOGIN );
-- --
2.16.3 2.15.1.windows.2

8
BungeeCord-Patches/0047-Forge-is-a-first-class-citizen.patch
View File

@ -1,14 +1,14 @@
From 11d2b646be887ba892480c2d92a704f9fe484892 Mon Sep 17 00:00:00 2001 From 419a755bd7712ed8685a01bdee5d060f5fb0e3e7 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk> From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100 Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen 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 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 22ebfe44..43c6e24a 100644 index 47d4c585..1b486867 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -277,8 +277,6 @@ public class BungeeCord extends ProxyServer @@ -276,8 +276,6 @@ public class BungeeCord extends ProxyServer
registerChannel( ForgeConstants.FML_TAG ); registerChannel( ForgeConstants.FML_TAG );
registerChannel( ForgeConstants.FML_HANDSHAKE_TAG ); registerChannel( ForgeConstants.FML_HANDSHAKE_TAG );
registerChannel( ForgeConstants.FORGE_REGISTER ); registerChannel( ForgeConstants.FORGE_REGISTER );
@ -31,5 +31,5 @@ index d3f0b2d8..242535d0 100644
@Synchronized("serversLock") // Waterfall @Synchronized("serversLock") // Waterfall
public void load() public void load()
-- --
2.16.1 2.15.1.windows.2