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

Updated Upstream (BungeeCord) 

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:
d8c222ae Update date
d20e622b Apply checkstyle to javadoc
6c8a0cce Remove m2e settings, causes useless warnings
2f547f73 Fix some javadoc warnings
5f29e939 #2720: Send different log message for pings (vs login)
46521568 #2740: Fix BaseComponent#equals() stack overflow
d2ceccd6 #2725: Various improvements to chat API
7ed4c41d #2723: Improved Send Command
This commit is contained in:
Shane Freeder 2020-01-06 19:43:23 +00:00
parent 20db3bf47f
commit 3a793b886c
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
21 changed files with 144 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 065893b5231b4d88a39f2c94c1335d227f5efec9
Subproject commit d8c222ae798cc72c9e368802cfe0676ba4e42a65

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

@ -1,4 +1,4 @@
From d17a85af9c2c799a9032df9c6e7a149c39a72895 Mon Sep 17 00:00:00 2001
From f0bf6c9420a842123293120ff1834cd3b6cca46a 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
@ -483,7 +483,7 @@ index f11cad04..f8b549dc 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 37d4b242..56cf5f31 100644
index 55a01bea..9898507c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -613,9 +613,9 @@ index 37d4b242..56cf5f31 100644
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -196,4 +231,87 @@
</plugins>
</pluginManagement>
@@ -165,4 +200,87 @@
</plugin>
</plugins>
</build>
+
+ <profiles>

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

@ -1,15 +1,15 @@
From 27a82909e4dc59093e8dfed729e0f56141665c87 Mon Sep 17 00:00:00 2001
From 0128906f9d17aaa42fbdf64bbadf41770f2c87ca Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 25 Oct 2016 11:58:37 -0400
Subject: [PATCH] Add Waterfall configuration files
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 5419445b..0e4e4096 100644
index 40ffa779..899b8647 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -78,4 +78,9 @@ public interface ProxyConfig
* The favicon used for the server ping list.
@@ -101,4 +101,9 @@ public interface ProxyConfig
* @return favicon
*/
Favicon getFaviconObject();
+
@ -42,7 +42,7 @@ index 00000000..741ebfde
+
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index f367f66a..1269cc10 100644
index f210cc3f..a1320099 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -10,6 +10,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -118,5 +118,5 @@ index 0ec6dabb..44011a96 100644
if ( permissions == null )
{
--
2.21.0
2.24.1

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

@ -1,4 +1,4 @@
From 9d0423a0fc9c025eb17ae9c86635cad557f964af Mon Sep 17 00:00:00 2001
From 1acf38d9b835459183bfc53539c3f56e3fab2dfa Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Thu, 19 May 2016 10:55:20 -0700
Subject: [PATCH] Disable Metrics
@ -6,7 +6,7 @@ Subject: [PATCH] Disable Metrics
MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 1269cc10..57d82b66 100644
index a1320099..5636e0c9 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -121,7 +121,7 @@ public class BungeeCord extends ProxyServer
@ -38,10 +38,10 @@ index 1269cc10..57d82b66 100644
getLogger().info( "Disabling plugins" );
diff --git a/proxy/src/main/java/net/md_5/bungee/Metrics.java b/proxy/src/main/java/net/md_5/bungee/Metrics.java
deleted file mode 100644
index 4fd3dd78..00000000
index eabf7573..00000000
--- a/proxy/src/main/java/net/md_5/bungee/Metrics.java
+++ /dev/null
@@ -1,129 +0,0 @@
@@ -1,134 +0,0 @@
-package net.md_5.bungee;
-
-import java.io.BufferedReader;
@ -96,7 +96,10 @@ index 4fd3dd78..00000000
- }
-
- /**
- * Generic method that posts a plugin to the metrics website
- * Generic method that posts a plugin to the metrics website.
- *
- * @param isPing first post or not
- * @throws IOException any errors encountered
- */
- private void postPlugin(boolean isPing) throws IOException
- {
@ -154,6 +157,7 @@ index 4fd3dd78..00000000
- * @param buffer the StringBuilder to append the data pair onto
- * @param key the key value
- * @param value the value
- * @throws UnsupportedEncodingException if UTF-8 encoding not supported
- */
- private static void encodeDataPair(final StringBuilder buffer, final String key, final String value) throws UnsupportedEncodingException
- {
@ -165,6 +169,7 @@ index 4fd3dd78..00000000
- *
- * @param text the text to encode
- * @return the encoded text, as UTF-8
- * @throws UnsupportedEncodingException if UTF-8 encoding not supported
- */
- private static String encode(final String text) throws UnsupportedEncodingException
- {
@ -172,5 +177,5 @@ index 4fd3dd78..00000000
- }
-}
--
2.21.0
2.24.1

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

@ -1,4 +1,4 @@
From 9cd04197709364da43f7239b2742859a8125cea0 Mon Sep 17 00:00:00 2001
From 13f04d202d0f756b106fec3b54cfa34e25c181d4 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions
@ -249,10 +249,10 @@ index 88d36ad2..fc92a7b5 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index 7abc76c6..a43082e8 100644
index 18c9fa6f..47f2c876 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -622,7 +622,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -619,7 +619,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
@ -262,5 +262,5 @@ index 7abc76c6..a43082e8 100644
@Override
--
2.21.0
2.24.1

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

@ -1,4 +1,4 @@
From a1c00179eedc983afb5ba68f6a28f15e1aad64dc Mon Sep 17 00:00:00 2001
From 1139b010c10e54335a955ccb9911f8376968c2ea Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled
@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
No breaking changes occur due to this patch.
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index 91b8b41a..ac54ff74 100644
index 74ae718a..cf397206 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
@ -67,10 +67,10 @@ index 91b8b41a..ac54ff74 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index fda93018..e5a63541 100644
index 5b72efea..fb7141a1 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -164,8 +164,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -165,8 +165,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this );
@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
* The FML 1.8 handshake token.
*/
--
2.21.0
2.24.1

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

@ -1,14 +1,14 @@
From 719e279e25eeee7776bc671b039cf71cc4ed5674 Mon Sep 17 00:00:00 2001
From bc753096ca1c59125c7338f5276942018e3325c2 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 64db54af..51ac3deb 100644
index df38e297..563b6911 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
@@ -226,6 +226,26 @@ public class ComponentsTest
@@ -322,6 +322,26 @@ public class ComponentsTest
Assert.assertEquals( eventRetention[1].getClickEvent(), testClickEvent );
}
@ -53,5 +53,5 @@ index 7e63488c..e85c55b7 100644
+ }
}
--
2.22.0
2.24.1

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

@ -1,4 +1,4 @@
From e54d0a29244ada71fe13ab32225f120c799f579e Mon Sep 17 00:00:00 2001
From 3fe05ff7372f21618834a3299a012165bdfc4371 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
@ -93,10 +93,10 @@ index cf397206..8cdd3f98 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 e5a63541..644522b1 100644
index fb7141a1..4700d1d6 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -70,6 +70,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -71,6 +71,7 @@ public final class UserConnection implements ProxiedPlayer
@NonNull
private final ProxyServer bungee;
@NonNull

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

@ -1,14 +1,14 @@
From b07cd80ecceb48d0dae9ea5760397e962cf0814e Mon Sep 17 00:00:00 2001
From cd902b232d0f227bcab4c1be569f106e6914181e Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 0e4e4096..1f643980 100644
index 899b8647..89bf000b 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -83,4 +83,21 @@ public interface ProxyConfig
@@ -106,4 +106,21 @@ public interface ProxyConfig
// Waterfall Options
//
@ -107,5 +107,5 @@ index 540cf213..de916f6e 100644
if ( tabComplete.getCursor().startsWith( "/" ) )
--
2.21.0
2.24.1

30
BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 6588b586f4be71f28c761811fc857a43c7b818f8 Mon Sep 17 00:00:00 2001
From beefdd141a82e9b063c99873c993ef104d433d7a Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Improve server list ping logging
@ -7,7 +7,7 @@ This functionality of this patch was adopted upstream, however, this
patch remains for a few misc improvements around here
diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
index e32a06c2..251e8726 100644
index 8cdd3f98..84f74bfb 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -415,6 +415,6 @@ public class ServerConnector extends PacketHandler
@ -31,30 +31,10 @@ index 1911923c..2eff743d 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index a43082e8..4731cb9d 100644
index 47f2c876..db0bdd53 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -295,16 +295,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
}
this.virtualHost = InetSocketAddress.createUnresolved( handshake.getHost(), handshake.getPort() );
- if ( bungee.getConfig().isLogPings() )
- {
- bungee.getLogger().log( Level.INFO, "{0} has connected", this );
- }
bungee.getPluginManager().callEvent( new PlayerHandshakeEvent( InitialHandler.this, handshake ) );
switch ( handshake.getRequestedProtocol() )
{
case 1:
+ if (bungee.getConfig().isLogPings()) {
+ bungee.getLogger().log( Level.INFO, "{0} is pinging", this );
+ }
// Ping
thisState = State.STATUS;
ch.setProtocol( Protocol.STATUS );
@@ -628,7 +627,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -625,7 +625,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String toString()
{
@ -76,5 +56,5 @@ index de916f6e..bdaee47e 100644
}
}
--
2.21.0
2.24.1

23
BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch
View File

@ -1,4 +1,4 @@
From 9ece9eee1db885737f55a9215fd014c1664f7ccf Mon Sep 17 00:00:00 2001
From f585ad9a010ee4bdadc19786829c14ec5f58cc3b Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.
@ -8,14 +8,15 @@ The provided methods will not move a player if a server is removed or the server
Thanks to Overcast for the idea
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 1f643980..dc4d609f 100644
index 89bf000b..69cbbf9b 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -31,9 +31,95 @@ public interface ProxyConfig
@@ -37,11 +37,95 @@ public interface ProxyConfig
/**
* Set of all servers.
+ *
- *
* @return servers
+ * @deprecated The returned map may be modified concurrently by the proxy.
+ * The safe alternative is {@link #getServersCopy()}.
*/
@ -105,13 +106,13 @@ index 1f643980..dc4d609f 100644
+ // Waterfall end
+
/**
* 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
index 15bea8fe..1c8e9eda 100644
index 490a0944..218ec45c 100644
--- a/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
@@ -95,9 +95,25 @@ public abstract class ProxyServer
* return a fresh map each time.
*
* @return all registered remote server destinations
@ -156,7 +157,7 @@ index 262b29c8..d7ed3e11 100644
{
int index = path.indexOf( SEPARATOR );
diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
index 9693701d..3fdd9949 100644
index 59c104d3..698b420f 100644
--- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
+++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
@@ -83,7 +83,7 @@ public class CommandServer extends Command implements TabExecutor
@ -169,7 +170,7 @@ index 9693701d..3fdd9949 100644
private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 83a300dc..0ff6781c 100644
index 9b461efa..69d60a5f 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -596,10 +596,18 @@ public class BungeeCord extends ProxyServer
@ -310,5 +311,5 @@ index 193d8bce..2ec6c23c 100644
+ // Waterfall end
}
--
2.21.0
2.24.1

10
BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch
View File

@ -1,14 +1,14 @@
From 648840e84ec1a31f3937803146006a880ded4f98 Mon Sep 17 00:00:00 2001
From 6952c252c0b236b01aacc624bd2845ff554780e9 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index dc4d609f..db615ed9 100644
index 69cbbf9b..9218f31f 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -169,6 +169,13 @@ public interface ProxyConfig
@@ -190,6 +190,13 @@ public interface ProxyConfig
// Waterfall Options
//
@ -66,7 +66,7 @@ index 91743f01..111404fb 100644
public int getTabThrottle() {
return tabThrottle;
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index 0ff6781c..083bc177 100644
index 69d60a5f..46720458 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -650,7 +650,7 @@ public class BungeeCord extends ProxyServer
@ -79,5 +79,5 @@ index 0ff6781c..083bc177 100644
@Override
--
2.24.0
2.24.1

10
BungeeCord-Patches/0030-Add-timeout-variant-to-connect-methods.patch
View File

@ -1,4 +1,4 @@
From 7255231edac6dddba09610516d4580be97e8c31f Mon Sep 17 00:00:00 2001
From 5bed49892c75624caa565d253eafd92161c2b29a Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods
@ -75,10 +75,10 @@ index 867e4428..f7459860 100644
* Connects / transfers this user to the specified connection, gracefully
* closing the current one. Depending on the implementation, this method
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 644522b1..f3466956 100644
index 4700d1d6..7e4b375a 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -255,9 +255,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -256,9 +256,20 @@ public final class UserConnection implements ProxiedPlayer
public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry, ServerConnectEvent.Reason reason)
{
@ -99,7 +99,7 @@ index 644522b1..f3466956 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -351,7 +362,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -352,7 +363,7 @@ public final class UserConnection implements ProxiedPlayer
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
sendMessage( bungee.getTranslation( "fallback_lobby" ) );
@ -109,5 +109,5 @@ index 644522b1..f3466956 100644
{
disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
--
2.24.0
2.24.1

12
BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch
View File

@ -1,4 +1,4 @@
From 87d20245a793e386d85bfcf181701da0d9847d18 Mon Sep 17 00:00:00 2001
From 816fd124a3b3bbc135b5c5533bd80b7a989b62d1 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@ -169,7 +169,7 @@ index 00000000..7ed2dc3a
+ }
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index f3466956..74aa4f3e 100644
index 7e4b375a..2b33e722 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -1,7 +1,9 @@
@ -182,7 +182,7 @@ index f3466956..74aa4f3e 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -125,6 +127,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -126,6 +128,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard();
@Getter
private final Collection<UUID> sentBossBars = new HashSet<>();
@ -240,7 +240,7 @@ index 034040a0..fd14f518 100644
public void handle(Respawn respawn)
{
diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
index 0d683856..c1272da3 100644
index d15044f4..bea2bbff 100644
--- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandler.java
@@ -9,6 +9,8 @@ import lombok.NonNull;
@ -252,7 +252,7 @@ index 0d683856..c1272da3 100644
import net.md_5.bungee.protocol.packet.PluginMessage;
/**
@@ -92,9 +94,23 @@ public class ForgeClientHandler
@@ -94,9 +96,23 @@ public class ForgeClientHandler
public void resetHandshake()
{
state = ForgeClientHandshakeState.HELLO;
@ -277,5 +277,5 @@ index 0d683856..c1272da3 100644
* Sends the server mod list to the client, or stores it for sending later.
*
--
2.24.0
2.24.1

12
BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch
View File

@ -1,4 +1,4 @@
From c64e18322664b2b19ff86f05fa389611016cee5e Mon Sep 17 00:00:00 2001
From e07ab170b66d0c97f45a071d1edcd2dc915e3adb Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver
@ -6,10 +6,10 @@ Subject: [PATCH] Optionally use async Netty DNS resolver
We no longer need to cache the address for the session server now.
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index db615ed9..af93ae8c 100644
index 9218f31f..5a39c597 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -176,6 +176,13 @@ public interface ProxyConfig
@@ -197,6 +197,13 @@ public interface ProxyConfig
*/
String getGameVersion();
@ -24,7 +24,7 @@ index db615ed9..af93ae8c 100644
/**
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 2d66e26d..3ba7d5cb 100644
index cbf7a379..548b6bb9 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -41,6 +41,14 @@
@ -80,7 +80,7 @@ index 111404fb..ef44d334 100644
public int getTabThrottle() {
return tabThrottle;
diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
index 2feb4d66..b265bb43 100644
index f95d5b6f..6b44b37e 100644
--- a/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
+++ b/proxy/src/main/java/net/md_5/bungee/http/HttpClient.java
@@ -28,6 +28,10 @@ public class HttpClient
@ -183,5 +183,5 @@ index 6c418567..23241d68 100644
return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
}
--
2.24.0
2.24.1

8
BungeeCord-Patches/0041-Add-console-command-completion.patch
View File

@ -1,4 +1,4 @@
From f3129d715da03a91a0f1aca6eea0bd88bd01a2e4 Mon Sep 17 00:00:00 2001
From 12f921539a222e09cba84945585ac57c4227bc49 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 26 Sep 2017 18:59:37 +0200
Subject: [PATCH] Add console command completion
@ -7,10 +7,10 @@ Register command completer for JLine to complete command names and
command arguments (if supported).
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index bf894e4a..81bd18f0 100644
index 81eb3f8a..11abcbb7 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -202,6 +202,41 @@ public class PluginManager
@@ -205,6 +205,41 @@ public class PluginManager
return true;
}
@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
}
--
2.24.0
2.24.1

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

@ -1,4 +1,4 @@
From d561d41bfae92eebd1871ee0b7a57801f18aed2f Mon Sep 17 00:00:00 2001
From 2ac8cface993f8c6c7cf4e8882a6d85a89e78255 Mon Sep 17 00:00:00 2001
From: phenomax <phenomax@revayd.net>
Date: Thu, 10 Aug 2017 18:41:17 +0200
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@ -52,10 +52,10 @@ similarity index 100%
rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index c3f9eb1d..e3f8bcf6 100644
index df4b7d9a..376ae366 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -547,7 +547,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -545,7 +545,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
};
// fire login event
@ -65,5 +65,5 @@ index c3f9eb1d..e3f8bcf6 100644
@Override
--
2.24.0
2.24.1

23
BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch
View File

@ -1,14 +1,14 @@
From 1155588afc687d686d734ad71cdb779daa1fe669 Mon Sep 17 00:00:00 2001
From 775c5214d00b2694364dd26fcab216338b0e4bfa Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Thu, 8 Feb 2018 19:10:52 +0100
Subject: [PATCH] Optionally log InitialHandler connections
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index af93ae8c..058cca67 100644
index 5a39c597..167cc3aa 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -169,6 +169,13 @@ public interface ProxyConfig
@@ -190,6 +190,13 @@ public interface ProxyConfig
// Waterfall Options
//
@ -61,18 +61,21 @@ index ef44d334..4ff8da6d 100644
public String getGameVersion() {
return gameVersion;
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index e3f8bcf6..34f7f997 100644
index 376ae366..8e637718 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -314,7 +314,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -315,7 +315,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection
break;
case 2:
// Login
- if ( !bungee.getConfig().isLogPings() )
- bungee.getLogger().log( Level.INFO, "{0} has connected", this );
+ if (BungeeCord.getInstance().getConfig().isLogInitialHandlerConnections() ) // Waterfall
{
bungee.getLogger().log( Level.INFO, "{0} has connected", this );
}
+ {
+ bungee.getLogger().log( Level.INFO, "{0} has connected", this );
+ }
thisState = State.USERNAME;
ch.setProtocol( Protocol.LOGIN );
--
2.24.0
2.24.1

10
BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From 9ca8e2ccb7047c10c172b9635aacf01111b86244 Mon Sep 17 00:00:00 2001
From ab161819def12b90ea804eff66cb3826d1be3744 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 14 Jan 2019 03:35:21 +0000
Subject: [PATCH] Provide an option to disable entity metadata rewriting
@ -12,10 +12,10 @@ may also create various issues with mods which do not support this,
hence why the configuration option is provided
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 058cca67..6bc54495 100644
index 167cc3aa..217cd6a3 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -207,4 +207,9 @@ public interface ProxyConfig
@@ -228,4 +228,9 @@ public interface ProxyConfig
* @return should we disable the tab completion limit for 1.13+ clients
*/
boolean isDisableModernTabLimiter();
@ -121,10 +121,10 @@ index 7aa792a2..00cd477f 100644
if ( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_14 )
{
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index 74aa4f3e..eeb7a51e 100644
index 2b33e722..b4cbc3f3 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -730,4 +730,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -741,4 +741,10 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
}

8
BungeeCord-Patches/0050-Report-slow-events-in-milliseconds.patch
View File

@ -1,4 +1,4 @@
From a4d949a57edd3e44403db85279ee99d229b000fa Mon Sep 17 00:00:00 2001
From cdc746a9ee1c083ea0598a553647e17498fde3bc Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 26 Mar 2019 04:28:18 +0000
Subject: [PATCH] Report slow events in milliseconds
@ -11,10 +11,10 @@ community, especially when we do not care about nanosecond level
accuracy.
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index 81bd18f0..9408e6c2 100644
index 11abcbb7..5b99c84a 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -435,9 +435,9 @@ public class PluginManager
@@ -438,9 +438,9 @@ public class PluginManager
long elapsed = System.nanoTime() - start;
if ( elapsed > 250000000 )
{
@ -27,5 +27,5 @@ index 81bd18f0..9408e6c2 100644
}
return event;
--
2.24.0
2.24.1

96
BungeeCord-Patches/0051-Fix-upstream-javadocs.patch
View File

@ -1,74 +1,75 @@
From 674e6779cd3c7db539ead28bf224cfdf6bbfc5a9 Mon Sep 17 00:00:00 2001
From fe117d6dea1360ea75662d587efcd1725de0921f Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 30 Mar 2019 15:11:11 +0000
Subject: [PATCH] Fix upstream javadocs
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
index 6bc54495..fd422f36 100644
index 217cd6a3..9f8f4740 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
@@ -16,22 +16,27 @@ public interface ProxyConfig
@@ -17,27 +17,25 @@ public interface ProxyConfig
/**
* Time before users are disconnected due to no network activity.
*
- * @return timeout
+ * @return the time before users are disconnected due to no network activity.
*/
int getTimeout();
/**
* UUID used for metrics.
- *
- * @return uuid
+ * @return the UUID used for metrics
*/
String getUuid();
/**
* Set of all listeners.
- *
- * @return listeners
+ * @return a set of all listeners
*/
Collection<ListenerInfo> getListeners();
/**
* Set of all servers.
*
- * @return servers
+ * @return a map of registered servers
+ *
* @deprecated The returned map may be modified concurrently by the proxy.
* The safe alternative is {@link #getServersCopy()}.
*/
@@ -122,32 +127,44 @@ public interface ProxyConfig
@@ -129,14 +127,14 @@ public interface ProxyConfig
/**
* Does the server authenticate with mojang
+ *
* Does the server authenticate with Mojang.
*
- * @return online mode
+ * @return if the server authenticates to mojang
*/
boolean isOnlineMode();
/**
* Whether proxy commands are logged to the proxy log
+ *
* Whether proxy commands are logged to the proxy log.
*
- * @return log commands
+ * @return should the proxy log commands
*/
boolean isLogCommands();
/**
* Returns the player max.
+ *
+ * @return the player limit
*/
int getPlayerLimit();
@@ -150,22 +148,22 @@ public interface ProxyConfig
/**
* A collection of disabled commands.
+ *
*
- * @return disabled commands
+ * @return a collection of disabled commands
*/
Collection<String> getDisabledCommands();
/**
* The connection throttle delay.
+ *
*
- * @return throttle
+ * @return the connection throttle delay
*/
@Deprecated
@ -77,65 +78,32 @@ index 6bc54495..fd422f36 100644
/**
- * Whether the proxy will parse IPs with spigot or not
+ * Whether the proxy will forward the players information (UUID, IP)
+ *
*
- * @return ip forward
+ * @return should we forward player information
*/
@Deprecated
boolean isIpForward();
@@ -155,6 +172,7 @@ public interface ProxyConfig
@@ -173,7 +171,7 @@ public interface ProxyConfig
/**
* The encoded favicon.
*
- * @return favicon
+ * @return the encoded favicon
* @deprecated Use #getFaviconObject instead.
*/
@Deprecated
@@ -162,6 +180,8 @@ public interface ProxyConfig
@@ -182,7 +180,7 @@ public interface ProxyConfig
/**
* The favicon used for the server ping list.
+ *
*
- * @return favicon
+ * @return the favicon used for the server ping list
*/
Favicon getFaviconObject();
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 1c8e9eda..d44ac67e 100644
--- a/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyServer.java
@@ -52,6 +52,9 @@ public abstract class ProxyServer
/**
* Gets a localized string from the .properties file.
*
+ * @param name the name of the translation
+ * @param args the arguments used for translation
+ *
* @return the localized string
*/
public abstract String getTranslation(String name, Object... args);
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
index 9408e6c2..884f78c8 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -148,6 +148,7 @@ public class PluginManager
* @param sender the sender executing the command
* @param commandLine the complete command line including command name and
* arguments
+ * @param tabResults the List for tab results to be added to, or null if executing the command
* @return whether the command was handled
*/
public boolean dispatchCommand(CommandSender sender, String commandLine, List<String> tabResults)
@@ -475,6 +476,8 @@ public class PluginManager
/**
* Unregister all of a Plugin's listener.
+ *
+ * @param plugin the plugin to unregister listeners for
*/
public void unregisterListeners(Plugin plugin)
{
diff --git a/api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java b/api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java
index 5d2b088c..be32ba89 100644
index 32732703..46d70184 100644
--- a/api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java
+++ b/api/src/main/java/net/md_5/bungee/api/scheduler/TaskScheduler.java
@@ -85,6 +85,7 @@ public interface TaskScheduler
@ -144,8 +112,8 @@ index 5d2b088c..be32ba89 100644
* An executor service which underlies this scheduler.
+ * @param plugin The plugin of which to fetch an executor service for
*
* @param plugin owning plugin
* @return the underlying executor service or compatible wrapper
*/
--
2.24.0
2.24.1