diff --git a/BungeeCord b/BungeeCord index 70370fa..a3ab2bf 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 70370faf5df80180610a43b678cd6b542cb7cd9f +Subproject commit a3ab2bf58e87f7ebc9131b1b969ce918986d9cbd diff --git a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch index ad44aa6..ee022ca 100644 --- a/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch +++ b/BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch @@ -1,14 +1,14 @@ -From 4e5947be07add5513e17ef88a8cc8cfea5f16ecc Mon Sep 17 00:00:00 2001 +From 96117eeb20c6213a829847d91d41f0b75f35f64b Mon Sep 17 00:00:00 2001 From: Techcable 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 7a8dbda4..c2dc9bd1 100644 +index 2e41b4c4..6495e7f2 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 -@@ -109,4 +109,9 @@ public interface ProxyConfig +@@ -125,4 +125,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 82ba6afb..03d51d88 100644 +index e1a6b2b3..56a0f29c 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; diff --git a/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch b/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch index a442b99..016c067 100644 --- a/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch +++ b/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch @@ -1,4 +1,4 @@ -From f773ac3808fea1fb04889bb30f3c89539cf1d6f0 Mon Sep 17 00:00:00 2001 +From bb2018d11642a88b3f04ae4efe193b3e7ea8999b Mon Sep 17 00:00:00 2001 From: Techcable 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 e53a3ff9..99e7376b 100644 +index 147110e4..a2f62648 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 -@@ -261,7 +261,7 @@ public class DownstreamBridge extends PacketHandler +@@ -262,7 +262,7 @@ public class DownstreamBridge extends PacketHandler brand = ByteBufAllocator.DEFAULT.heapBuffer(); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand ); diff --git a/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch index ce4c943..7e52dcc 100644 --- a/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch +++ b/BungeeCord-Patches/0011-Optimize-uuid-conversions.patch @@ -1,4 +1,4 @@ -From 5c0326d8bd07fa3561fec33132282c6f8c61cb88 Mon Sep 17 00:00:00 2001 +From 6f40b978b1b45fccab4e33c16778680fb33e91d0 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 14 Mar 2016 15:40:44 -0700 Subject: [PATCH] Optimize uuid conversions @@ -250,10 +250,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 a53b113c..b9e42946 100644 +index 8fbb6221..9b9641d2 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 -@@ -626,7 +626,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -647,7 +647,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String getUUID() { diff --git a/BungeeCord-Patches/0014-Allow-removing-servers-or-changing-addresses-on-relo.patch b/BungeeCord-Patches/0014-Allow-removing-servers-or-changing-addresses-on-relo.patch index 8bdb21b..816e24d 100644 --- a/BungeeCord-Patches/0014-Allow-removing-servers-or-changing-addresses-on-relo.patch +++ b/BungeeCord-Patches/0014-Allow-removing-servers-or-changing-addresses-on-relo.patch @@ -1,4 +1,4 @@ -From 27cf7ff629c65d8fdca62df4124069274e1deadd Mon Sep 17 00:00:00 2001 +From 08bece5292489452ccba95c8847398db189d9a11 Mon Sep 17 00:00:00 2001 From: Techcable 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 03d51d88..8d047dfc 100644 +index 56a0f29c..d640313a 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 03d51d88..8d047dfc 100644 import net.md_5.bungee.util.CaseInsensitiveMap; import net.md_5.bungee.util.CaseInsensitiveSet; -@@ -107,20 +110,38 @@ public abstract class Configuration implements ProxyConfig +@@ -111,20 +114,38 @@ public abstract class Configuration implements ProxyConfig servers = new CaseInsensitiveMap<>( newServers ); } else { diff --git a/BungeeCord-Patches/0016-Micro-optimizations.patch b/BungeeCord-Patches/0016-Micro-optimizations.patch index 3c6e8cb..072ea0f 100644 --- a/BungeeCord-Patches/0016-Micro-optimizations.patch +++ b/BungeeCord-Patches/0016-Micro-optimizations.patch @@ -1,4 +1,4 @@ -From 3260c592ab79a6b338f7f69712043155c3f7a7bf Mon Sep 17 00:00:00 2001 +From 91cb5ca08458019081a0c4f463d2df21451da80f Mon Sep 17 00:00:00 2001 From: Tux 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 99e7376b..6d5b00c2 100644 +index a2f62648..ea905b07 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 -@@ -243,7 +243,6 @@ public class DownstreamBridge extends PacketHandler +@@ -244,7 +244,6 @@ public class DownstreamBridge extends PacketHandler @Override public void handle(PluginMessage pluginMessage) throws Exception { @@ -34,7 +34,7 @@ index 99e7376b..6d5b00c2 100644 PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() ); if ( bungee.getPluginManager().callEvent( event ).isCancelled() ) -@@ -270,6 +269,7 @@ public class DownstreamBridge extends PacketHandler +@@ -271,6 +270,7 @@ public class DownstreamBridge extends PacketHandler if ( pluginMessage.getTag().equals( "BungeeCord" ) ) { diff --git a/BungeeCord-Patches/0019-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0019-Add-basic-support-for-configurable-tab-complete-thro.patch index b9dbc25..ed0a7bb 100644 --- a/BungeeCord-Patches/0019-Add-basic-support-for-configurable-tab-complete-thro.patch +++ b/BungeeCord-Patches/0019-Add-basic-support-for-configurable-tab-complete-thro.patch @@ -1,14 +1,14 @@ -From d01ebf0bea7d2b6aea4bd299d20ac63d57022a3e Mon Sep 17 00:00:00 2001 +From 1f2f759843f42eea8962ed3a0bb6be82bd17022c Mon Sep 17 00:00:00 2001 From: Johannes Donath 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 c2dc9bd1..57835bb7 100644 +index 6495e7f2..b6845bc4 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 -@@ -114,4 +114,21 @@ public interface ProxyConfig +@@ -130,4 +130,21 @@ public interface ProxyConfig // Waterfall Options // diff --git a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch index d49db89..f8fb3d1 100644 --- a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From e224b3ff66473f60105966a95e15737214bcde86 Mon Sep 17 00:00:00 2001 +From ec5ec620f2bab5a9575390f4b12bd590d8f510b6 Mon Sep 17 00:00:00 2001 From: Janmm14 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 6d5b00c2..9e03a228 100644 +index ea905b07..6598781b 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 -@@ -609,6 +609,6 @@ public class DownstreamBridge extends PacketHandler +@@ -610,6 +610,6 @@ public class DownstreamBridge extends PacketHandler @Override public String toString() { @@ -31,14 +31,27 @@ index 6d5b00c2..9e03a228 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 b9e42946..4e5c8a5c 100644 +index 9b9641d2..1109a9b5 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 -@@ -632,7 +632,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -653,20 +653,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @Override public String toString() { -- return "[" + ( ( getName() != null ) ? getName() : getSocketAddress() ) + "] <-> InitialHandler"; +- StringBuilder sb = new StringBuilder(); +- sb.append( '[' ); +- +- String currentName = getName(); +- if ( currentName != null ) +- { +- sb.append( currentName ); +- sb.append( ',' ); +- } +- +- sb.append( getSocketAddress() ); +- sb.append( "] <-> InitialHandler" ); +- +- return sb.toString(); + return "[" + getSocketAddress() + ( getName() != null ? "|" + getName() : "" ) + "] <-> InitialHandler"; } diff --git a/BungeeCord-Patches/0021-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0021-Add-a-property-to-accept-invalid-ping-packets.patch index b297ffc..0c9f0a7 100644 --- a/BungeeCord-Patches/0021-Add-a-property-to-accept-invalid-ping-packets.patch +++ b/BungeeCord-Patches/0021-Add-a-property-to-accept-invalid-ping-packets.patch @@ -1,4 +1,4 @@ -From a800541bf9f9f2557aa559671bcde723c8d37395 Mon Sep 17 00:00:00 2001 +From 5492c19431ddf229e50c190378ec25c5b5ab7804 Mon Sep 17 00:00:00 2001 From: Techcable Date: Sun, 7 Feb 2016 00:01:19 -0700 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 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 4e5c8a5c..6fc5cd18 100644 +index 1109a9b5..5c692ef2 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 -@@ -262,10 +262,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -277,10 +277,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection thisState = State.PING; } diff --git a/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch b/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch index aca5961..191fb66 100644 --- a/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch +++ b/BungeeCord-Patches/0022-Use-a-worker-and-a-boss-event-loop-group.patch @@ -1,4 +1,4 @@ -From 982ee67746ef5784ba6dc9cefd69f6357273a414 Mon Sep 17 00:00:00 2001 +From 61eb721efb50a13bb3de793753cf74764d54850c Mon Sep 17 00:00:00 2001 From: kamcio96 Date: Mon, 14 Mar 2016 16:07:20 -0700 Subject: [PATCH] Use a worker and a boss event loop group. @@ -70,7 +70,7 @@ 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 7d7e5a7f..fa4fff0e 100644 +index 9d581d9a..7b002089 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java @@ -184,7 +184,7 @@ public class BungeeServerInfo implements ServerInfo @@ -80,7 +80,7 @@ index 7d7e5a7f..fa4fff0e 100644 - .group( BungeeCord.getInstance().eventLoops ) + .group( BungeeCord.getInstance().workerEventLoopGroup ) .handler( PipelineUtils.BASE ) - .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable + .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, BungeeCord.getInstance().getConfig().getRemotePingTimeout() ) .remoteAddress( socketAddress ) -- 2.25.0 diff --git a/BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch b/BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch index bbe876f..dd41ec4 100644 --- a/BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch +++ b/BungeeCord-Patches/0026-Add-dynamic-server-addition-removal-api.patch @@ -1,4 +1,4 @@ -From 6566339942a14a4eebfe3bdc63ea7b01308617cb Mon Sep 17 00:00:00 2001 +From 221084c6a92729adb87f71dfe381799a78852869 Mon Sep 17 00:00:00 2001 From: Troy Frew 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 57835bb7..a1c1ba33 100644 +index b6845bc4..edbae4ea 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 8d047dfc..f45ff190 100644 +index d640313a..115f614e 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 8d047dfc..f45ff190 100644 /** * Set of all servers. */ -@@ -66,6 +69,7 @@ public abstract class Configuration implements ProxyConfig +@@ -68,6 +71,7 @@ public abstract class Configuration implements ProxyConfig private boolean preventProxyConnections; private boolean forgeSupport; @@ -229,7 +229,7 @@ index 8d047dfc..f45ff190 100644 public void load() { ConfigurationAdapter adapter = ProxyServer.getInstance().getConfigurationAdapter(); -@@ -110,7 +114,7 @@ public abstract class Configuration implements ProxyConfig +@@ -114,7 +118,7 @@ public abstract class Configuration implements ProxyConfig servers = new CaseInsensitiveMap<>( newServers ); } else { @@ -238,7 +238,7 @@ index 8d047dfc..f45ff190 100644 for ( ServerInfo oldServer : oldServers.values() ) { -@@ -173,4 +177,71 @@ public abstract class Configuration implements ProxyConfig +@@ -177,4 +181,71 @@ public abstract class Configuration implements ProxyConfig { return favicon; } diff --git a/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch index 1a2d8a2..c3afee8 100644 --- a/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch +++ b/BungeeCord-Patches/0028-Improve-ServerKickEvent.patch @@ -1,4 +1,4 @@ -From 02a64f1c57178caf14008a4a8c7b0fa4e29a381a Mon Sep 17 00:00:00 2001 +From 5fe009487736a995b301341c2457453e3e0a81d9 Mon Sep 17 00:00:00 2001 From: Nathan Poirier 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 9e03a228..e8e8b69d 100644 +index 6598781b..d1654bcc 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; @@ -132,7 +132,7 @@ index 9e03a228..e8e8b69d 100644 } ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() ); -@@ -493,7 +509,11 @@ public class DownstreamBridge extends PacketHandler +@@ -494,7 +510,11 @@ public class DownstreamBridge extends PacketHandler public void handle(Kick kick) throws Exception { ServerInfo def = con.updateAndGetNextServer( server.getInfo() ); diff --git a/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch b/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch index 2c965eb..a37fd89 100644 --- a/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch +++ b/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch @@ -1,14 +1,14 @@ -From 857f4d66e4c45048af62752482847fc6a6422af7 Mon Sep 17 00:00:00 2001 +From d889bb2dc25aca87073e4708e9fad8fade6d7cd7 Mon Sep 17 00:00:00 2001 From: Troy Frew 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 a1c1ba33..480fb574 100644 +index edbae4ea..749059ab 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 -@@ -198,6 +198,13 @@ public interface ProxyConfig +@@ -214,6 +214,13 @@ public interface ProxyConfig // Waterfall Options // diff --git a/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch b/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch index b56604f..954ab8e 100644 --- a/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch +++ b/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch @@ -1,4 +1,4 @@ -From 31a9b2654787ac8bcca8865a5043f8bf8a24b743 Mon Sep 17 00:00:00 2001 +From cb58c49decf1797f281bf3beb8c773574af6f396 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Thu, 15 Sep 2016 22:38:37 +0200 Subject: [PATCH] Fix potion race condition on Forge 1.8.9 @@ -194,7 +194,7 @@ index 3f9a91e3..a5da62f3 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 e8e8b69d..9c64d159 100644 +index d1654bcc..cfd25859 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 @@ -50,6 +50,8 @@ import net.md_5.bungee.protocol.PacketWrapper; @@ -206,7 +206,7 @@ index e8e8b69d..9c64d159 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; -@@ -594,6 +596,32 @@ public class DownstreamBridge extends PacketHandler +@@ -595,6 +597,32 @@ public class DownstreamBridge extends PacketHandler } } diff --git a/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch b/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch index c3e3ba3..d6eea04 100644 --- a/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch +++ b/BungeeCord-Patches/0034-Optionally-use-async-Netty-DNS-resolver.patch @@ -1,4 +1,4 @@ -From 94b012e38aa05a0e17a9873c31b8c396f4f4ed99 Mon Sep 17 00:00:00 2001 +From 828f6d18bf3da33fe5e82ec3ede6d0c3452851ee Mon Sep 17 00:00:00 2001 From: Tux 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 480fb574..888ef5a3 100644 +index 749059ab..6141128b 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 -@@ -205,6 +205,13 @@ public interface ProxyConfig +@@ -221,6 +221,13 @@ public interface ProxyConfig */ String getGameVersion(); diff --git a/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch b/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch index 3c7d214..0cb27bd 100644 --- a/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch +++ b/BungeeCord-Patches/0042-Providing-access-to-the-player-s-LoginResult-on-Logi.patch @@ -1,4 +1,4 @@ -From 6296caeeabc735ff1c5e0d11559f309b9cbce6f7 Mon Sep 17 00:00:00 2001 +From c9194973b3e932e6f56818fd1d568653b98a45ca Mon Sep 17 00:00:00 2001 From: phenomax 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 6fc5cd18..ed9643c1 100644 +index 5c692ef2..1771ff3c 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 -@@ -546,7 +546,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -561,7 +561,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection }; // fire login event diff --git a/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch b/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch index bb631c9..44df5b9 100644 --- a/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch +++ b/BungeeCord-Patches/0043-Optionally-log-InitialHandler-connections.patch @@ -1,14 +1,14 @@ -From 2716fc037774a033673a599191b1820b9229ea73 Mon Sep 17 00:00:00 2001 +From a4f49ca4293a902d4926c7a428bb6aaa131911e3 Mon Sep 17 00:00:00 2001 From: Gabriele C 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 888ef5a3..ebf541fb 100644 +index 6141128b..e0baca9c 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 -@@ -198,6 +198,13 @@ public interface ProxyConfig +@@ -214,6 +214,13 @@ public interface ProxyConfig // Waterfall Options // @@ -61,10 +61,10 @@ 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 ed9643c1..8e1b9a19 100644 +index 1771ff3c..007d3daf 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 -@@ -316,7 +316,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection +@@ -331,7 +331,10 @@ public class InitialHandler extends PacketHandler implements PendingConnection break; case 2: // Login diff --git a/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch b/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch index 27ff4eb..8aef171 100644 --- a/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch +++ b/BungeeCord-Patches/0044-Forge-is-a-first-class-citizen.patch @@ -1,4 +1,4 @@ -From 1cfed6f417c7c162cd157ea6ab228bec3382fade Mon Sep 17 00:00:00 2001 +From dd2cf45d254e2cb6248febee298fd430badc264a Mon Sep 17 00:00:00 2001 From: Jamie Mansfield 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 f45ff190..35eb2503 100644 +index 115f614e..85d2197a 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 -@@ -67,7 +67,7 @@ public abstract class Configuration implements ProxyConfig +@@ -69,7 +69,7 @@ public abstract class Configuration implements ProxyConfig private Favicon favicon; private int compressionThreshold = 256; private boolean preventProxyConnections; diff --git a/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch index 2463982..ade24dc 100644 --- a/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch +++ b/BungeeCord-Patches/0047-Provide-an-option-to-disable-entity-metadata-rewriti.patch @@ -1,4 +1,4 @@ -From dd829b720395a30759602f2d3e191a08aed57932 Mon Sep 17 00:00:00 2001 +From 41cc576d0b2d95be6c0bf22e989604e18725913a Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 ebf541fb..ab012bff 100644 +index e0baca9c..f3bced0a 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 -@@ -236,4 +236,9 @@ public interface ProxyConfig +@@ -252,4 +252,9 @@ public interface ProxyConfig * @return should we disable the tab completion limit for 1.13+ clients */ boolean isDisableModernTabLimiter(); @@ -136,10 +136,10 @@ index a5da62f3..95dbaefd 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 9c64d159..f1c57532 100644 +index cfd25859..f845da09 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 -@@ -600,6 +600,7 @@ public class DownstreamBridge extends PacketHandler +@@ -601,6 +601,7 @@ public class DownstreamBridge extends PacketHandler @Override public void handle(EntityEffect entityEffect) throws Exception { @@ -147,7 +147,7 @@ index 9c64d159..f1c57532 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()) { -@@ -611,6 +612,7 @@ public class DownstreamBridge extends PacketHandler +@@ -612,6 +613,7 @@ public class DownstreamBridge extends PacketHandler @Override public void handle(EntityRemoveEffect removeEffect) throws Exception { diff --git a/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch b/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch index b775be6..e59d1bc 100644 --- a/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch +++ b/BungeeCord-Patches/0048-Add-ProxyDefineCommandsEvent.patch @@ -1,4 +1,4 @@ -From 6214cf5dec29beec397cd1700e9fac2abe8fbd25 Mon Sep 17 00:00:00 2001 +From e435ea79171606a862522b6fb8ca484b42dc8062 Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 f1c57532..9fbb5e92 100644 +index f845da09..d7d0fafc 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; @@ -78,7 +78,7 @@ index f1c57532..9fbb5e92 100644 import lombok.RequiredArgsConstructor; import net.md_5.bungee.ServerConnection; import net.md_5.bungee.ServerConnection.KeepAliveData; -@@ -635,9 +638,25 @@ public class DownstreamBridge extends PacketHandler +@@ -636,9 +639,25 @@ public class DownstreamBridge extends PacketHandler { boolean modified = false; diff --git a/BungeeCord-Patches/0051-Fix-upstream-javadocs.patch b/BungeeCord-Patches/0050-Fix-upstream-javadocs.patch similarity index 90% rename from BungeeCord-Patches/0051-Fix-upstream-javadocs.patch rename to BungeeCord-Patches/0050-Fix-upstream-javadocs.patch index efd77b5..aa0bc83 100644 --- a/BungeeCord-Patches/0051-Fix-upstream-javadocs.patch +++ b/BungeeCord-Patches/0050-Fix-upstream-javadocs.patch @@ -1,11 +1,11 @@ -From fe4c48c2acf9657709e84d43f3c686e94f86797b Mon Sep 17 00:00:00 2001 +From 8452d6a2710d398005009f8dbffd8fe0935145f4 Mon Sep 17 00:00:00 2001 From: Shane Freeder 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 ab012bff..fe46b9f3 100644 +index f3bced0a..4a198ee9 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 ab012bff..fe46b9f3 100644 */ boolean isLogCommands(); -@@ -158,22 +156,22 @@ public interface ProxyConfig +@@ -158,7 +156,7 @@ public interface ProxyConfig /** * A collection of disabled commands. * @@ -66,6 +66,7 @@ index ab012bff..fe46b9f3 100644 */ Collection getDisabledCommands(); +@@ -181,15 +179,15 @@ public interface ProxyConfig /** * The connection throttle delay. * @@ -76,7 +77,7 @@ index ab012bff..fe46b9f3 100644 int getThrottle(); /** -- * Whether the proxy will parse IPs with spigot or not +- * Whether the proxy will parse IPs with spigot or not. + * Whether the proxy will forward the players information (UUID, IP) * - * @return ip forward @@ -84,7 +85,7 @@ index ab012bff..fe46b9f3 100644 */ @Deprecated boolean isIpForward(); -@@ -181,7 +179,7 @@ public interface ProxyConfig +@@ -197,7 +195,7 @@ public interface ProxyConfig /** * The encoded favicon. * @@ -93,7 +94,7 @@ index ab012bff..fe46b9f3 100644 * @deprecated Use #getFaviconObject instead. */ @Deprecated -@@ -190,7 +188,7 @@ public interface ProxyConfig +@@ -206,7 +204,7 @@ public interface ProxyConfig /** * The favicon used for the server ping list. * diff --git a/BungeeCord-Patches/0050-Report-slow-events-in-milliseconds.patch b/BungeeCord-Patches/0050-Report-slow-events-in-milliseconds.patch deleted file mode 100644 index 41e935f..0000000 --- a/BungeeCord-Patches/0050-Report-slow-events-in-milliseconds.patch +++ /dev/null @@ -1,31 +0,0 @@ -From cdc746a9ee1c083ea0598a553647e17498fde3bc Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Tue, 26 Mar 2019 04:28:18 +0000 -Subject: [PATCH] Report slow events in milliseconds - -nanoseconds is an overly accurate measurement for event handers, and -only ends up confusing and overly worrying people. - -milliseconds is a much more normal and expected measurement in the -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 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 -@@ -438,9 +438,9 @@ public class PluginManager - long elapsed = System.nanoTime() - start; - if ( elapsed > 250000000 ) - { -- ProxyServer.getInstance().getLogger().log( Level.WARNING, "Event {0} took {1}ns to process!", new Object[] -+ ProxyServer.getInstance().getLogger().log( Level.WARNING, "Event {0} took {1}ms to process!", new Object[] // Waterfall - human values - { -- event, elapsed -+ event, elapsed / 1000000 // Waterfall - human values - } ); - } - return event; --- -2.24.1 - diff --git a/BungeeCord-Patches/0052-OSX-native-zlib-and-crypto.patch b/BungeeCord-Patches/0051-OSX-native-zlib-and-crypto.patch similarity index 99% rename from BungeeCord-Patches/0052-OSX-native-zlib-and-crypto.patch rename to BungeeCord-Patches/0051-OSX-native-zlib-and-crypto.patch index a30ddf5..c6fcd73 100644 --- a/BungeeCord-Patches/0052-OSX-native-zlib-and-crypto.patch +++ b/BungeeCord-Patches/0051-OSX-native-zlib-and-crypto.patch @@ -1,4 +1,4 @@ -From bf4a21dfcdf4007b8ece29546e1fe55ba418e10b Mon Sep 17 00:00:00 2001 +From 35b8e8fb98e03b28a8bd96170c227d540c27087a Mon Sep 17 00:00:00 2001 From: Colin Godsey Date: Tue, 16 Apr 2019 07:25:52 -0600 Subject: [PATCH] OSX native zlib and crypto @@ -42,7 +42,7 @@ index aa7a12b4..0cedd7e5 100644 #include #include diff --git a/native/src/main/java/net/md_5/bungee/jni/NativeCode.java b/native/src/main/java/net/md_5/bungee/jni/NativeCode.java -index 6c92c1f5..9695c6e4 100644 +index 4e4130bc..a6d7cfb5 100644 --- a/native/src/main/java/net/md_5/bungee/jni/NativeCode.java +++ b/native/src/main/java/net/md_5/bungee/jni/NativeCode.java @@ -19,6 +19,7 @@ public final class NativeCode @@ -329,5 +329,5 @@ literal 0 HcmV?d00001 -- -2.24.0 +2.25.0 diff --git a/BungeeCord-Patches/0053-Speed-up-packet-construction.patch b/BungeeCord-Patches/0052-Speed-up-packet-construction.patch similarity index 99% rename from BungeeCord-Patches/0053-Speed-up-packet-construction.patch rename to BungeeCord-Patches/0052-Speed-up-packet-construction.patch index d0af8f3..35a8327 100644 --- a/BungeeCord-Patches/0053-Speed-up-packet-construction.patch +++ b/BungeeCord-Patches/0052-Speed-up-packet-construction.patch @@ -1,4 +1,4 @@ -From cc895993a4408d955ec341c456e9a9578711836e Mon Sep 17 00:00:00 2001 +From 97b71e8a4e4b621ef8e6942231e3543a0245e2af Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 17 Apr 2019 09:24:38 +0300 Subject: [PATCH] Speed up packet construction @@ -352,5 +352,5 @@ index 3556eda0..44dc34ff 100644 final int getId(Class packet, int version) { -- -2.24.0 +2.25.0 diff --git a/BungeeCord-Patches/0054-Speed-up-some-common-exceptions.patch b/BungeeCord-Patches/0053-Speed-up-some-common-exceptions.patch similarity index 98% rename from BungeeCord-Patches/0054-Speed-up-some-common-exceptions.patch rename to BungeeCord-Patches/0053-Speed-up-some-common-exceptions.patch index 88de5db..b7180d0 100644 --- a/BungeeCord-Patches/0054-Speed-up-some-common-exceptions.patch +++ b/BungeeCord-Patches/0053-Speed-up-some-common-exceptions.patch @@ -1,4 +1,4 @@ -From 3744c3a8de353d95401dec3e47a93c7c5d820eb5 Mon Sep 17 00:00:00 2001 +From 0bc727fa43296b49b9826ca9225a28a90d7f26d8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 25 Nov 2019 19:54:06 +0000 Subject: [PATCH] Speed up some common exceptions @@ -157,5 +157,5 @@ index ac99d02c..0c1ecfb8 100644 // Waterfall start -- -2.24.1 +2.25.0 diff --git a/BungeeCord-Patches/0055-ConnectionInitEvent.patch b/BungeeCord-Patches/0054-ConnectionInitEvent.patch similarity index 98% rename from BungeeCord-Patches/0055-ConnectionInitEvent.patch rename to BungeeCord-Patches/0054-ConnectionInitEvent.patch index 8fb0056..7b55304 100644 --- a/BungeeCord-Patches/0055-ConnectionInitEvent.patch +++ b/BungeeCord-Patches/0054-ConnectionInitEvent.patch @@ -1,4 +1,4 @@ -From 3fff0a06f93a7b1882fa1a6563889697270cec0a Mon Sep 17 00:00:00 2001 +From 86125c4bf1167e2d12111686fd37ac9214a0edf1 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 2 Dec 2019 11:35:17 +0000 Subject: [PATCH] ConnectionInitEvent