diff --git a/BungeeCord b/BungeeCord index 61cb2df..8d49424 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 61cb2df9f359fd56d8ec9f2946adb419dccace63 +Subproject commit 8d494242265790df1dc6d92121d1a37b726ac405 diff --git a/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch b/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch index 1a7c53e..e5976fd 100644 --- a/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch +++ b/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch @@ -1,4 +1,4 @@ -From 3a77b663f41bad162c3af12e57ec27e60e7f947f Mon Sep 17 00:00:00 2001 +From 3e32503a298ddc706ccc936603688f7fcfd11ab7 Mon Sep 17 00:00:00 2001 From: Daniel Naylor Date: Tue, 25 Oct 2016 12:23:07 -0400 Subject: [PATCH] Add support for FML with IP Forwarding enabled @@ -67,10 +67,10 @@ index 4a96a601..61c53b30 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 47a30f71..eb6b8ea9 100644 +index 93df9747..74c5a089 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -181,8 +181,12 @@ public final class UserConnection implements ProxiedPlayer +@@ -178,8 +178,12 @@ public final class UserConnection implements ProxiedPlayer forgeClientHandler = new ForgeClientHandler( this ); diff --git a/BungeeCord-Patches/0017-Micro-optimizations.patch b/BungeeCord-Patches/0017-Micro-optimizations.patch index 180b15f..5292b36 100644 --- a/BungeeCord-Patches/0017-Micro-optimizations.patch +++ b/BungeeCord-Patches/0017-Micro-optimizations.patch @@ -1,4 +1,4 @@ -From 49dc09c6b0f40d42941d1f1b190353bbb503275b Mon Sep 17 00:00:00 2001 +From 86cf116e41ffadfd0946248948aaf0f37908034e Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 18:05:33 -0600 Subject: [PATCH] Micro-optimizations @@ -46,10 +46,10 @@ index 36af60a9..a3a16d23 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 eb6b8ea9..b3e352c1 100644 +index 74c5a089..28e79933 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -549,7 +549,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -546,7 +546,7 @@ public final class UserConnection implements ProxiedPlayer @Override public Locale getLocale() { @@ -59,7 +59,7 @@ index eb6b8ea9..b3e352c1 100644 @Override diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java -index 1010f361..2a2b9d8c 100644 +index a92b806c..19fd3b3b 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 @@ -222,7 +222,6 @@ public class DownstreamBridge extends PacketHandler @@ -79,5 +79,5 @@ index 1010f361..2a2b9d8c 100644 String subChannel = in.readUTF(); -- -2.13.4 +2.14.1 diff --git a/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch index 1200b1b..823203a 100644 --- a/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch +++ b/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch @@ -1,4 +1,4 @@ -From 061e26b5c385d34e39b848275ee1b25a6a025033 Mon Sep 17 00:00:00 2001 +From 2ae557c53e38fa8a3089a8e4bd1e2d8d1d6efacc Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 19 May 2016 17:09:22 -0600 Subject: [PATCH] Allow invalid packet ids for forge servers @@ -37,10 +37,10 @@ index e7cb3803..447eaae7 100644 { packet.read( in, prot.getDirection(), protocolVersion ); diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java -index 61e2b42d..c92a922a 100644 +index f06aa95a..8e142323 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java -@@ -352,14 +352,23 @@ public enum Protocol +@@ -355,14 +355,23 @@ public enum Protocol return protocol; } @@ -93,7 +93,7 @@ index 61c53b30..b29ee7c5 100644 ch.write( BungeeCord.getInstance().registerChannels() ); 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 b3e352c1..4c9f09ea 100644 +index 28e79933..ccb6b6ca 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 @@ -105,10 +105,10 @@ index b3e352c1..4c9f09ea 100644 @Getter @NonNull diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java -index 3e0ec0d5..a6d9310f 100644 +index 847a3eca..27ee21f2 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 -@@ -210,6 +210,12 @@ public abstract class EntityMap +@@ -211,6 +211,12 @@ public abstract class EntityMap int packetId = DefinedPacket.readVarInt( packet ); int packetIdLength = packet.readerIndex() - readerIndex; diff --git a/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch index fd5c7ec..6381473 100644 --- a/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch +++ b/BungeeCord-Patches/0020-Add-basic-support-for-configurable-tab-complete-thro.patch @@ -1,4 +1,4 @@ -From c1900744f556a04f6c65ebb14bea70873a03847d Mon Sep 17 00:00:00 2001 +From 934a2c8434ef06eff5dcbe5454dd720ad63dcb95 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 @@ -64,7 +64,7 @@ index 056b8040..e56d3591 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 167f1f88..02a4ca37 100644 +index bb43810b..5f5f00ca 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 @@ -32,6 +32,8 @@ public class UpstreamBridge extends PacketHandler @@ -76,7 +76,7 @@ index 167f1f88..02a4ca37 100644 public UpstreamBridge(ProxyServer bungee, UserConnection con) { this.bungee = bungee; -@@ -145,6 +147,16 @@ public class UpstreamBridge extends PacketHandler +@@ -148,6 +150,16 @@ public class UpstreamBridge extends PacketHandler @Override public void handle(TabCompleteRequest tabComplete) throws Exception { diff --git a/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch b/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch index dc3ab72..97371e1 100644 --- a/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From dda08d057e2f6a042eb7c68b45acbd8ba6ca8046 Mon Sep 17 00:00:00 2001 +From effe6870c21519d34b2bab639b74320f3764adb2 Mon Sep 17 00:00:00 2001 From: Janmm14 Date: Sat, 12 Dec 2015 23:43:30 +0100 Subject: [PATCH] Optional server list ping logging. @@ -73,7 +73,7 @@ index b29ee7c5..79e88cc5 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 2a2b9d8c..c2e751be 100644 +index 19fd3b3b..dcd6924d 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 @@ -510,6 +510,6 @@ public class DownstreamBridge extends PacketHandler @@ -122,10 +122,10 @@ index 2f0cd28d..7ab4d042 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 02a4ca37..2526ef16 100644 +index 5f5f00ca..4665f821 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 -@@ -230,6 +230,6 @@ public class UpstreamBridge extends PacketHandler +@@ -233,6 +233,6 @@ public class UpstreamBridge extends PacketHandler @Override public String toString() { diff --git a/BungeeCord-Patches/0028-Validate-that-chat-messages-are-non-blank.patch b/BungeeCord-Patches/0028-Validate-that-chat-messages-are-non-blank.patch index abb898d..29c9013 100644 --- a/BungeeCord-Patches/0028-Validate-that-chat-messages-are-non-blank.patch +++ b/BungeeCord-Patches/0028-Validate-that-chat-messages-are-non-blank.patch @@ -1,4 +1,4 @@ -From a294666b73306af83ef4b4416721a0d67754272b Mon Sep 17 00:00:00 2001 +From 1d7114fe53b92991889d294b5e4fc5408e1779f8 Mon Sep 17 00:00:00 2001 From: Tux 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 2526ef16..6b79875d 100644 +index 4665f821..3000a567 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 @@ -1,6 +1,7 @@ @@ -44,7 +44,7 @@ index 2526ef16..6b79875d 100644 import io.netty.channel.Channel; import java.util.ArrayList; import java.util.List; -@@ -131,6 +132,7 @@ public class UpstreamBridge extends PacketHandler +@@ -134,6 +135,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 diff --git a/BungeeCord-Patches/0030-Better-debug-checks.patch b/BungeeCord-Patches/0030-Better-debug-checks.patch index d7f416a..0c5a5ac 100644 --- a/BungeeCord-Patches/0030-Better-debug-checks.patch +++ b/BungeeCord-Patches/0030-Better-debug-checks.patch @@ -1,14 +1,14 @@ -From 3436ebcbc3e03fea4854418225d787f9760be408 Mon Sep 17 00:00:00 2001 +From 1a10f98b691f7720cdf09fdc3ae2c6b2b2dc9740 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 6 Apr 2016 23:46:00 -0700 Subject: [PATCH] Better debug checks diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java -index c92a922a..34260bd3 100644 +index 8e142323..7ff5411b 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java -@@ -425,7 +425,7 @@ public enum Protocol +@@ -428,7 +428,7 @@ public enum Protocol { throw new BadPacketException( "Unsupported protocol version" ); } @@ -18,5 +18,5 @@ index c92a922a..34260bd3 100644 return protocolData.packetMap.get( packet ); } -- -2.13.0 +2.14.1 diff --git a/BungeeCord-Patches/0036-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0036-Add-timeout-variant-to-connect-methods.patch index af668b5..30cad8a 100644 --- a/BungeeCord-Patches/0036-Add-timeout-variant-to-connect-methods.patch +++ b/BungeeCord-Patches/0036-Add-timeout-variant-to-connect-methods.patch @@ -1,4 +1,4 @@ -From ac99d83de8dc8ba2438aea3002420d4c43a2706c Mon Sep 17 00:00:00 2001 +From 728532bc0e6953a2b212e4da09e0ec54bd3a1955 Mon Sep 17 00:00:00 2001 From: Ichbinjoe Date: Sat, 16 Jul 2016 20:44:01 -0400 Subject: [PATCH] Add timeout variant to connect methods @@ -49,10 +49,10 @@ index 16cfff8b..98754bdf 100644 * Gets the server this player is connected to. * 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 4c9f09ea..9c56d06a 100644 +index ccb6b6ca..055a886d 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java -@@ -249,6 +249,12 @@ public final class UserConnection implements ProxiedPlayer +@@ -246,6 +246,12 @@ public final class UserConnection implements ProxiedPlayer public void connect(ServerInfo info, final Callback callback, final boolean retry) { @@ -65,7 +65,7 @@ index 4c9f09ea..9c56d06a 100644 Preconditions.checkNotNull( info, "info" ); ServerConnectEvent event = new ServerConnectEvent( this, info ); -@@ -322,7 +328,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -319,7 +325,7 @@ public final class UserConnection implements ProxiedPlayer if ( retry && def != null && ( getServer() == null || def != getServer().getInfo() ) ) { sendMessage( bungee.getTranslation( "fallback_lobby" ) ); @@ -74,7 +74,7 @@ index 4c9f09ea..9c56d06a 100644 } else if ( dimensionChange ) { disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) ); -@@ -337,7 +343,7 @@ public final class UserConnection implements ProxiedPlayer +@@ -334,7 +340,7 @@ public final class UserConnection implements ProxiedPlayer .channel( PipelineUtils.getChannel() ) .group( ch.getHandle().eventLoop() ) .handler( initializer ) @@ -84,5 +84,5 @@ index 4c9f09ea..9c56d06a 100644 // Windows is bugged, multi homed users will just have to live with random connecting IPs if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() ) -- -2.13.4 +2.14.1 diff --git a/BungeeCord-Patches/0039-Fix-potion-race-condition-on-Forge-1.8.9.patch b/BungeeCord-Patches/0039-Fix-potion-race-condition-on-Forge-1.8.9.patch index 32758c4..881f46d 100644 --- a/BungeeCord-Patches/0039-Fix-potion-race-condition-on-Forge-1.8.9.patch +++ b/BungeeCord-Patches/0039-Fix-potion-race-condition-on-Forge-1.8.9.patch @@ -1,4 +1,4 @@ -From 3608a11fa794e90f20ad13887e924a10d31daf9f Mon Sep 17 00:00:00 2001 +From 066f5b27e7c360d88363420dfb72c31030318975 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 @@ -32,7 +32,7 @@ index 6f782c8f..2d5fc487 100644 + // Waterfall end } diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java -index 34260bd3..62635c5b 100644 +index 7ff5411b..fb2fea87 100644 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java @@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat; @@ -163,7 +163,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 9c56d06a..ddc37312 100644 +index 055a886d..af393836 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -2,7 +2,9 @@ package net.md_5.bungee; @@ -176,7 +176,7 @@ index 9c56d06a..ddc37312 100644 import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; -@@ -128,6 +130,10 @@ public final class UserConnection implements ProxiedPlayer +@@ -125,6 +127,10 @@ public final class UserConnection implements ProxiedPlayer private final Scoreboard serverSentScoreboard = new Scoreboard(); @Getter private final Collection sentBossBars = new HashSet<>(); @@ -188,7 +188,7 @@ index 9c56d06a..ddc37312 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 0d8ae30f..70b5a415 100644 +index de905b83..92fe918b 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 @@ -31,6 +31,8 @@ import net.md_5.bungee.netty.PacketHandler; @@ -271,5 +271,5 @@ index 673497e5..17e250d4 100644 * Sends the server mod list to the client, or stores it for sending later. * -- -2.13.4 +2.14.1