diff --git a/BungeeCord b/BungeeCord index d7eef6f..272258c 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit d7eef6ff2ec249581fb3f2e0093a5c3a54d818a4 +Subproject commit 272258cf5a22602fda6b9030fa91524d90511c11 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 307199f..0e8b462 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,4 +1,4 @@ -From be7b04004bf0e9b284f22b38328ce96ef35d6708 Mon Sep 17 00:00:00 2001 +From f01d605e461267209d8008ae203ac107a6e82679 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,10 +64,10 @@ 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 bb43810b..5f5f00ca 100644 +index 19a52458..ccdeaed1 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 +@@ -33,6 +33,8 @@ public class UpstreamBridge extends PacketHandler private final ProxyServer bungee; private final UserConnection con; @@ -76,7 +76,7 @@ index bb43810b..5f5f00ca 100644 public UpstreamBridge(ProxyServer bungee, UserConnection con) { this.bungee = bungee; -@@ -148,6 +150,16 @@ public class UpstreamBridge extends PacketHandler +@@ -149,6 +151,16 @@ public class UpstreamBridge extends PacketHandler @Override public void handle(TabCompleteRequest tabComplete) throws Exception { @@ -94,5 +94,5 @@ index bb43810b..5f5f00ca 100644 if ( tabComplete.getCursor().startsWith( "/" ) ) -- -2.14.1 +2.16.1 diff --git a/BungeeCord-Patches/0021-Optional-server-list-ping-logging.patch b/BungeeCord-Patches/0021-Optional-server-list-ping-logging.patch index b48425a..84370c3 100644 --- a/BungeeCord-Patches/0021-Optional-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0021-Optional-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From 46db972c5d1f48f5e444612d75cf519523ef11ff Mon Sep 17 00:00:00 2001 +From 9ef8e269ec4e0905e4a47ca654c92f05fd2f95cf 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 19fd3b3b..dcd6924d 100644 +index 5829dda9..02284f16 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 @@ -85,7 +85,7 @@ index 19fd3b3b..dcd6924d 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 2f0cd28d..7ab4d042 100644 +index 1824b97f..5f0801f4 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 @@ -281,19 +281,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -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 5f5f00ca..4665f821 100644 +index ccdeaed1..742ff503 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 -@@ -233,6 +233,6 @@ public class UpstreamBridge extends PacketHandler +@@ -237,6 +237,6 @@ public class UpstreamBridge extends PacketHandler @Override public String toString() { @@ -134,5 +134,5 @@ index 5f5f00ca..4665f821 100644 } } -- -2.14.1 +2.16.1 diff --git a/BungeeCord-Patches/0025-Validate-that-chat-messages-are-non-blank.patch b/BungeeCord-Patches/0025-Validate-that-chat-messages-are-non-blank.patch index 398c888..ec89f64 100644 --- a/BungeeCord-Patches/0025-Validate-that-chat-messages-are-non-blank.patch +++ b/BungeeCord-Patches/0025-Validate-that-chat-messages-are-non-blank.patch @@ -1,4 +1,4 @@ -From f806016da3aaa600066cecdf0fca9f0ba867a53d Mon Sep 17 00:00:00 2001 +From 438e3698ce253ec55958ceb5bc5e91b94aea6f2e 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 4665f821..3000a567 100644 +index 742ff503..b2513e93 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 4665f821..3000a567 100644 import io.netty.channel.Channel; import java.util.ArrayList; import java.util.List; -@@ -134,6 +135,7 @@ public class UpstreamBridge extends PacketHandler +@@ -135,6 +136,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 4665f821..3000a567 100644 ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() ); if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() ) -- -2.14.1 +2.16.1