Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-28 03:27:37 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

Browse Source 
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:
70370faf Add checkstyle indentation checks
24a53a67 Show socketAddress in BungeeServerInfo.toString
503b4827 Fix bad formatting in EntityMap
eeb37479 #2710: Store queue of pending keepalives
3f6aa033 Also check that things that should not be padded are so
78a84953 Add more checkstyle rules
636c0207 #2753: Add configurable remote ping caching
a4512e50 Check Maven version in action build & don't print noisy transfer progress
f510989c Add building of pull requests via GitHub Actions
This commit is contained in:
Shane Freeder 2020-01-24 22:41:39 +00:00
parent 8af0366f2b
commit c21eed1f7b
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
22 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 129884f44d950ed97b36e1237dc1a098975c0475
Subproject commit 70370faf5df80180610a43b678cd6b542cb7cd9f

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

@ -1,14 +1,14 @@
From 53ca44cfd9e560819d2d24781b46e042ab580ba2 Mon Sep 17 00:00:00 2001
From 4e5947be07add5513e17ef88a8cc8cfea5f16ecc 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 40ffa779..899b8647 100644
index 7a8dbda4..c2dc9bd1 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
@@ -101,4 +101,9 @@ public interface ProxyConfig
@@ -109,4 +109,9 @@ public interface ProxyConfig
* @return favicon
*/
Favicon getFaviconObject();
@ -63,7 +63,7 @@ index bea66b10..d11c66bb 100644
* Localization bundle.
*/
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 49638c3a..886f3b4c 100644
index 82ba6afb..03d51d88 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -24,7 +24,7 @@ import net.md_5.bungee.util.CaseInsensitiveSet;

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

@ -1,4 +1,4 @@
From 45466510d9ff0749fafd8fb8cad280081dd4e911 Mon Sep 17 00:00:00 2001
From f773ac3808fea1fb04889bb30f3c89539cf1d6f0 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Tue, 3 May 2016 20:31:52 -0700
Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -56,10 +56,10 @@ index 2ebfef5e..15b9e66c 100644
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
index b66712d2..a9b74334 100644
index e53a3ff9..99e7376b 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -258,7 +258,7 @@ public class DownstreamBridge extends PacketHandler
@@ -261,7 +261,7 @@ public class DownstreamBridge extends PacketHandler
brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );

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

@ -1,4 +1,4 @@
From 9471d10b02adc9528141cdc5fec98490e5ffe4a2 Mon Sep 17 00:00:00 2001
From 36f9a586c2ebfb7947ab641c721219ad21090f98 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
@ -67,10 +67,10 @@ index 15b9e66c..e8fd2148 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 3d7e9043..aebfdc16 100644
index afcae3a2..8f369a3d 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -166,8 +166,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -163,8 +163,12 @@ public final class UserConnection implements ProxiedPlayer
forgeClientHandler = new ForgeClientHandler( this );

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

@ -1,4 +1,4 @@
From 0bab27125230a455e4ca9f5664ac7ce02f15feb6 Mon Sep 17 00:00:00 2001
From 27cf7ff629c65d8fdca62df4124069274e1deadd Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 28 Jan 2016 15:13:29 -0700
Subject: [PATCH] Allow removing servers or changing addresses on reload
@ -10,7 +10,7 @@ Kicks players on failure to move.
Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 886f3b4c..193d8bce 100644
index 03d51d88..8d047dfc 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -11,12 +11,15 @@ import java.util.UUID;
@ -29,7 +29,7 @@ index 886f3b4c..193d8bce 100644
import net.md_5.bungee.util.CaseInsensitiveMap;
import net.md_5.bungee.util.CaseInsensitiveSet;
@@ -105,20 +108,38 @@ public abstract class Configuration implements ProxyConfig
@@ -107,20 +110,38 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{
@ -79,5 +79,5 @@ index 886f3b4c..193d8bce 100644
for ( ListenerInfo listener : listeners )
--
2.21.0
2.25.0

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

@ -1,4 +1,4 @@
From 2f4d0290d2a7b1a6d6d0ac802897d2209348e8f6 Mon Sep 17 00:00:00 2001
From 3260c592ab79a6b338f7f69712043155c3f7a7bf Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations
@ -23,10 +23,10 @@ index 8d13d49f..5643684c 100644
{
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index a9b74334..567b5b71 100644
index 99e7376b..6d5b00c2 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -240,7 +240,6 @@ public class DownstreamBridge extends PacketHandler
@@ -243,7 +243,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(PluginMessage pluginMessage) throws Exception
{
@ -34,7 +34,7 @@ index a9b74334..567b5b71 100644
PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
@@ -267,6 +266,7 @@ public class DownstreamBridge extends PacketHandler
@@ -270,6 +269,7 @@ public class DownstreamBridge extends PacketHandler
if ( pluginMessage.getTag().equals( "BungeeCord" ) )
{

8
BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch
View File

@ -1,14 +1,14 @@
From a01374cdf7cd8a968e6f84ca92aaa27c10017113 Mon Sep 17 00:00:00 2001
From bc43bcb3f3d2366bf219df39d735a89622a6b620 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Fri, 12 Feb 2016 23:55:53 -0500
Subject: [PATCH] Resolve sendData() deadlocks
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
index cab2c21b..3dab3422 100644
index 0874544f..7d7e5a7f 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
@@ -108,19 +108,22 @@ public class BungeeServerInfo implements ServerInfo
@@ -110,19 +110,22 @@ public class BungeeServerInfo implements ServerInfo
Preconditions.checkNotNull( channel, "channel" );
Preconditions.checkNotNull( data, "data" );
@ -41,7 +41,7 @@ index cab2c21b..3dab3422 100644
+ return false;
}
@Override
private long lastPing;
--
2.25.0

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

@ -1,14 +1,14 @@
From cd902b232d0f227bcab4c1be569f106e6914181e Mon Sep 17 00:00:00 2001
From d01ebf0bea7d2b6aea4bd299d20ac63d57022a3e 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 899b8647..89bf000b 100644
index c2dc9bd1..57835bb7 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
@@ -106,4 +106,21 @@ public interface ProxyConfig
@@ -114,4 +114,21 @@ public interface ProxyConfig
// Waterfall Options
//
@ -73,10 +73,10 @@ index 741ebfde..91743f01 100644
+ }
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index 540cf213..de916f6e 100644
index 6b888c85..c7e1a621 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -37,6 +37,8 @@ public class UpstreamBridge extends PacketHandler
@@ -38,6 +38,8 @@ public class UpstreamBridge extends PacketHandler
private final ProxyServer bungee;
private final UserConnection con;
@ -85,7 +85,7 @@ index 540cf213..de916f6e 100644
public UpstreamBridge(ProxyServer bungee, UserConnection con)
{
this.bungee = bungee;
@@ -153,6 +155,20 @@ public class UpstreamBridge extends PacketHandler
@@ -156,6 +158,20 @@ public class UpstreamBridge extends PacketHandler
@Override
public void handle(TabCompleteRequest tabComplete) throws Exception
{
@ -107,5 +107,5 @@ index 540cf213..de916f6e 100644
if ( tabComplete.getCursor().startsWith( "/" ) )
--
2.24.1
2.25.0

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

@ -1,4 +1,4 @@
From 0193f69ac34fca99f79151710e5b6e4b2f333495 Mon Sep 17 00:00:00 2001
From e224b3ff66473f60105966a95e15737214bcde86 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
@ -19,10 +19,10 @@ index e55d572a..281adc8c 100644
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 567b5b71..5401b7aa 100644
index 6d5b00c2..9e03a228 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -606,6 +606,6 @@ public class DownstreamBridge extends PacketHandler
@@ -609,6 +609,6 @@ public class DownstreamBridge extends PacketHandler
@Override
public String toString()
{
@ -44,10 +44,10 @@ index b9e42946..4e5c8a5c 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
index de916f6e..bdaee47e 100644
index c7e1a621..d44d4c2e 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -267,6 +267,6 @@ public class UpstreamBridge extends PacketHandler
@@ -270,6 +270,6 @@ public class UpstreamBridge extends PacketHandler
@Override
public String toString()
{

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

@ -1,4 +1,4 @@
From 6459c67045351f0b7216541572af29719bab1d15 Mon Sep 17 00:00:00 2001
From 982ee67746ef5784ba6dc9cefd69f6357273a414 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.
@ -70,10 +70,10 @@ index 5643684c..b18027e2 100644
getLogger().info( "Thank you and goodbye" );
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
index 3dab3422..8e86462c 100644
index 7d7e5a7f..fa4fff0e 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
@@ -158,7 +158,7 @@ public class BungeeServerInfo implements ServerInfo
@@ -184,7 +184,7 @@ public class BungeeServerInfo implements ServerInfo
};
new Bootstrap()
.channel( PipelineUtils.getChannel( socketAddress ) )

8
BungeeCord-Patches/0024-Validate-that-chat-messages-are-non-blank.patch
View File

@ -1,4 +1,4 @@
From 24da31173f0c8a99366c8c157a0d07058e712a5f Mon Sep 17 00:00:00 2001
From fd2323156681ae38aeea32eb4c7b1f2141c4be93 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 25 Oct 2016 12:34:41 -0400
Subject: [PATCH] Validate that chat messages are non-blank
@ -33,7 +33,7 @@ index 00000000..940ad806
+ }
+}
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 4bb61f63..9287d168 100644
index d44d4c2e..4d8bac5d 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
@ -44,7 +44,7 @@ index 4bb61f63..9287d168 100644
import io.netty.channel.Channel;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -139,6 +140,7 @@ public class UpstreamBridge extends PacketHandler
@@ -142,6 +143,7 @@ public class UpstreamBridge extends PacketHandler
{
int maxLength = ( con.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_11 ) ? 256 : 100;
Preconditions.checkArgument( chat.getMessage().length() <= maxLength, "Chat message too long" ); // Mojang limit, check on updates
@ -53,5 +53,5 @@ index 4bb61f63..9287d168 100644
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
--
2.20.1
2.25.0

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

@ -1,4 +1,4 @@
From 23bafa3bee49774c0e57c0d8956237faa3e37bae Mon Sep 17 00:00:00 2001
From 6566339942a14a4eebfe3bdc63ea7b01308617cb 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,7 +8,7 @@ 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 89bf000b..69cbbf9b 100644
index 57835bb7..a1c1ba33 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
@@ -37,11 +37,95 @@ public interface ProxyConfig
@ -194,7 +194,7 @@ index b18027e2..d572ff28 100644
@Override
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 193d8bce..2ec6c23c 100644
index 8d047dfc..f45ff190 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -1,6 +1,7 @@
@ -221,7 +221,7 @@ index 193d8bce..2ec6c23c 100644
/**
* Set of all servers.
*/
@@ -65,6 +68,7 @@ public abstract class Configuration implements ProxyConfig
@@ -66,6 +69,7 @@ public abstract class Configuration implements ProxyConfig
private boolean preventProxyConnections;
private boolean forgeSupport;
@ -229,7 +229,7 @@ index 193d8bce..2ec6c23c 100644
public void load()
{
ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter();
@@ -108,7 +112,7 @@ public abstract class Configuration implements ProxyConfig
@@ -110,7 +114,7 @@ public abstract class Configuration implements ProxyConfig
servers = new CaseInsensitiveMap<>( newServers );
} else
{
@ -238,7 +238,7 @@ index 193d8bce..2ec6c23c 100644
for ( ServerInfo oldServer : oldServers.values() )
{
@@ -171,4 +175,71 @@ public abstract class Configuration implements ProxyConfig
@@ -173,4 +177,71 @@ public abstract class Configuration implements ProxyConfig
{
return favicon;
}

10
BungeeCord-Patches/0028-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From d360ae6416f837902eb7944b2a385424f793fbf1 Mon Sep 17 00:00:00 2001
From 02a64f1c57178caf14008a4a8c7b0fa4e29a381a Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent
@ -75,7 +75,7 @@ index 281adc8c..dae9e294 100644
{
// Pre cancel the event if we are going to try another server
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 5401b7aa..b5f3999f 100644
index 9e03a228..e8e8b69d 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -12,6 +12,7 @@ import com.mojang.brigadier.context.StringRange;
@ -86,7 +86,7 @@ index 5401b7aa..b5f3999f 100644
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled;
@@ -77,16 +78,19 @@ public class DownstreamBridge extends PacketHandler
@@ -78,16 +79,19 @@ public class DownstreamBridge extends PacketHandler
return;
}
@ -111,7 +111,7 @@ index 5401b7aa..b5f3999f 100644
}
@Override
@@ -101,7 +105,19 @@ public class DownstreamBridge extends PacketHandler
@@ -102,7 +106,19 @@ public class DownstreamBridge extends PacketHandler
if ( !server.isObsolete() )
{
@ -132,7 +132,7 @@ index 5401b7aa..b5f3999f 100644
}
ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
@@ -490,7 +506,11 @@ public class DownstreamBridge extends PacketHandler
@@ -493,7 +509,11 @@ public class DownstreamBridge extends PacketHandler
public void handle(Kick kick) throws Exception
{
ServerInfo def = con.updateAndGetNextServer( server.getInfo() );

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

@ -1,14 +1,14 @@
From 26998b60f3d214c2f7f3a3eb29c8f19dab507c18 Mon Sep 17 00:00:00 2001
From 857f4d66e4c45048af62752482847fc6a6422af7 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 69cbbf9b..9218f31f 100644
index a1c1ba33..480fb574 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
@@ -190,6 +190,13 @@ public interface ProxyConfig
@@ -198,6 +198,13 @@ public interface ProxyConfig
// Waterfall Options
//

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

@ -1,4 +1,4 @@
From 2b9371eea3da4a2600ab3e6e2811b2fc28b2a257 Mon Sep 17 00:00:00 2001
From fb2ee4df44963c8232471e2cef7964144697a67e 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 e245c3c0..a52e15eb 100644
index 3c0c4189..3f9a91e3 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -257,9 +257,20 @@ public final class UserConnection implements ProxiedPlayer
@@ -254,9 +254,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 e245c3c0..a52e15eb 100644
if ( callback != null )
{
// Convert the Callback<Boolean> to be compatible with Callback<Result> from ServerConnectRequest.
@@ -353,7 +364,7 @@ public final class UserConnection implements ProxiedPlayer
@@ -350,7 +361,7 @@ public final class UserConnection implements ProxiedPlayer
if ( request.isRetry() && def != null && ( getServer() == null || def != getServer().getInfo() ) )
{
sendMessage( bungee.getTranslation( "fallback_lobby" ) );

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

@ -1,4 +1,4 @@
From 6b9831e144e5d6b4653db345368a14b6b792dd1e Mon Sep 17 00:00:00 2001
From 31a9b2654787ac8bcca8865a5043f8bf8a24b743 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 a52e15eb..589e22f5 100644
index 3f9a91e3..a5da62f3 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 a52e15eb..589e22f5 100644
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@@ -127,6 +129,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -124,6 +126,10 @@ public final class UserConnection implements ProxiedPlayer
private final Scoreboard serverSentScoreboard = new Scoreboard();
@Getter
private final Collection<UUID> sentBossBars = new HashSet<>();
@ -194,10 +194,10 @@ index a52e15eb..589e22f5 100644
@Getter
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
index b5f3999f..708088f3 100644
index e8e8b69d..9c64d159 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -49,6 +49,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
@@ -50,6 +50,8 @@ 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.Commands;
@ -206,7 +206,7 @@ index b5f3999f..708088f3 100644
import net.md_5.bungee.protocol.packet.KeepAlive;
import net.md_5.bungee.protocol.packet.Kick;
import net.md_5.bungee.protocol.packet.PlayerListItem;
@@ -591,6 +593,32 @@ public class DownstreamBridge extends PacketHandler
@@ -594,6 +596,32 @@ public class DownstreamBridge extends PacketHandler
}
}

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

@ -1,4 +1,4 @@
From 0e434adbf5617dd8337126ecafe64c9202488d63 Mon Sep 17 00:00:00 2001
From 94b012e38aa05a0e17a9873c31b8c396f4f4ed99 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 9218f31f..5a39c597 100644
index 480fb574..888ef5a3 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
@@ -197,6 +197,13 @@ public interface ProxyConfig
@@ -205,6 +205,13 @@ public interface ProxyConfig
*/
String getGameVersion();
@ -24,7 +24,7 @@ index 9218f31f..5a39c597 100644
/**
diff --git a/proxy/pom.xml b/proxy/pom.xml
index cbf7a379..548b6bb9 100644
index 66561fd9..01cb5c50 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -41,6 +41,14 @@

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

@ -1,14 +1,14 @@
From d419c5a094b5505c8805014c57af310fbe6d3ef7 Mon Sep 17 00:00:00 2001
From 2716fc037774a033673a599191b1820b9229ea73 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 5a39c597..167cc3aa 100644
index 888ef5a3..ebf541fb 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
@@ -190,6 +190,13 @@ public interface ProxyConfig
@@ -198,6 +198,13 @@ public interface ProxyConfig
// Waterfall Options
//

6
BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch
View File

@ -1,4 +1,4 @@
From 71b98239c7ec267549a5fb17f3f4b22b1ae0a3df Mon Sep 17 00:00:00 2001
From 1cfed6f417c7c162cd157ea6ab228bec3382fade Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen
@ -18,10 +18,10 @@ index ce93fa50..c7ac1735 100644
isRunning = true;
diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
index 2ec6c23c..5841cf63 100644
index f45ff190..35eb2503 100644
--- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -66,7 +66,7 @@ public abstract class Configuration implements ProxyConfig
@@ -67,7 +67,7 @@ public abstract class Configuration implements ProxyConfig
private Favicon favicon;
private int compressionThreshold = 256;
private boolean preventProxyConnections;

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

@ -1,4 +1,4 @@
From 18aafc4693f761f341e062bc42a82cedfa8e6caf Mon Sep 17 00:00:00 2001
From dd829b720395a30759602f2d3e191a08aed57932 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 167cc3aa..217cd6a3 100644
index ebf541fb..ab012bff 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
@@ -228,4 +228,9 @@ public interface ProxyConfig
@@ -236,4 +236,9 @@ public interface ProxyConfig
* @return should we disable the tab completion limit for 1.13+ clients
*/
boolean isDisableModernTabLimiter();
@ -121,10 +121,10 @@ index dae9e294..139c4f09 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 589e22f5..e9284882 100644
index a5da62f3..95dbaefd 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -748,4 +748,10 @@ public final class UserConnection implements ProxiedPlayer
@@ -745,4 +745,10 @@ public final class UserConnection implements ProxiedPlayer
{
return serverSentScoreboard;
}
@ -136,10 +136,10 @@ index 589e22f5..e9284882 100644
+ // Waterfall end
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index 708088f3..fe27b406 100644
index 9c64d159..f1c57532 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -597,6 +597,7 @@ public class DownstreamBridge extends PacketHandler
@@ -600,6 +600,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityEffect entityEffect) throws Exception
{
@ -147,7 +147,7 @@ index 708088f3..fe27b406 100644
// Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
// condition on the client.
if (this.con.getForgeClientHandler().isForgeUser() && !this.con.getForgeClientHandler().isHandshakeComplete()) {
@@ -608,6 +609,7 @@ public class DownstreamBridge extends PacketHandler
@@ -611,6 +612,7 @@ public class DownstreamBridge extends PacketHandler
@Override
public void handle(EntityRemoveEffect removeEffect) throws Exception
{
@ -156,7 +156,7 @@ index 708088f3..fe27b406 100644
}
diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
index ccebd15a..d2108587 100644
index 05e6b438..e6afb98d 100644
--- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
+++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufInputStream;

8
BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch
View File

@ -1,4 +1,4 @@
From e4a5ec61f04fb08b1d63d9c673b9e9b38440afe6 Mon Sep 17 00:00:00 2001
From 6214cf5dec29beec397cd1700e9fac2abe8fbd25 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 14 Mar 2019 07:44:06 +0000
Subject: [PATCH] Add ProxyDefineCommandsEvent
@ -54,7 +54,7 @@ index 00000000..1fd4fc90
+
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
index fe27b406..72133370 100644
index f1c57532..9fbb5e92 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
@@ -12,7 +12,8 @@ import com.mojang.brigadier.context.StringRange;
@ -77,8 +77,8 @@ index fe27b406..72133370 100644
+import java.util.Objects; // Waterfall
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.ServerConnection;
import net.md_5.bungee.UserConnection;
@@ -632,9 +635,25 @@ public class DownstreamBridge extends PacketHandler
import net.md_5.bungee.ServerConnection.KeepAliveData;
@@ -635,9 +638,25 @@ public class DownstreamBridge extends PacketHandler
{
boolean modified = false;

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

@ -1,11 +1,11 @@
From fe117d6dea1360ea75662d587efcd1725de0921f Mon Sep 17 00:00:00 2001
From fe4c48c2acf9657709e84d43f3c686e94f86797b 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 217cd6a3..9f8f4740 100644
index ab012bff..fe46b9f3 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
@@ -17,27 +17,25 @@ public interface ProxyConfig
@ -57,7 +57,7 @@ index 217cd6a3..9f8f4740 100644
*/
boolean isLogCommands();
@@ -150,22 +148,22 @@ public interface ProxyConfig
@@ -158,22 +156,22 @@ public interface ProxyConfig
/**
* A collection of disabled commands.
*
@ -84,7 +84,7 @@ index 217cd6a3..9f8f4740 100644
*/
@Deprecated
boolean isIpForward();
@@ -173,7 +171,7 @@ public interface ProxyConfig
@@ -181,7 +179,7 @@ public interface ProxyConfig
/**
* The encoded favicon.
*
@ -93,7 +93,7 @@ index 217cd6a3..9f8f4740 100644
* @deprecated Use #getFaviconObject instead.
*/
@Deprecated
@@ -182,7 +180,7 @@ public interface ProxyConfig
@@ -190,7 +188,7 @@ public interface ProxyConfig
/**
* The favicon used for the server ping list.
*
@ -115,5 +115,5 @@ index 32732703..46d70184 100644
* @param plugin owning plugin
* @return the underlying executor service or compatible wrapper
--
2.24.1
2.25.0