From 9fb1a1f574ff31527341a01706a451fddae44889 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Mon, 14 Nov 2016 22:46:55 +0000 Subject: [PATCH] Merge upstream --- BungeeCord | 2 +- ...ic-support-for-configurable-tab-complete-thro.patch | 10 +++++----- .../0022-Optional-server-list-ping-logging.patch | 6 +++--- ...028-Validate-that-chat-messages-are-non-blank.patch | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/BungeeCord b/BungeeCord index 9a4150c..f3e5f34 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 9a4150cd479119e251fa79ef6e0ddd85406cc391 +Subproject commit f3e5f34aebc23f07d9605e177ed33c6c2d0af1f7 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 5190489..c50c17f 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 a3bbfd1ad1fd98f0c26630c14b9f56e6c1593b81 Mon Sep 17 00:00:00 2001 +From c4ca03543b96e22be0dd9b466f07811abd7f34c1 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 @@ -65,10 +65,10 @@ index 692b83e..c3ae52f 100644 } \ No newline at end of file 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 8ccc7c5..4669dee 100644 +index 92d1da0..654be21 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 -@@ -30,6 +30,8 @@ public class UpstreamBridge extends PacketHandler +@@ -31,6 +31,8 @@ public class UpstreamBridge extends PacketHandler private final ProxyServer bungee; private final UserConnection con; @@ -77,7 +77,7 @@ index 8ccc7c5..4669dee 100644 public UpstreamBridge(ProxyServer bungee, UserConnection con) { this.bungee = bungee; -@@ -126,6 +128,16 @@ public class UpstreamBridge extends PacketHandler +@@ -128,6 +130,16 @@ public class UpstreamBridge extends PacketHandler @Override public void handle(TabCompleteRequest tabComplete) throws Exception { @@ -95,5 +95,5 @@ index 8ccc7c5..4669dee 100644 if ( tabComplete.getCursor().startsWith( "/" ) ) -- -2.7.4 (Apple Git-66) +2.10.0 diff --git a/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch b/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch index 7609289..e122b56 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 7a19a478b89b6df8cc345ea44cfc75d119a67565 Mon Sep 17 00:00:00 2001 +From ede5d2561eadd6f28fe3ee76dc2700992a8db477 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. @@ -123,10 +123,10 @@ index bdcbdb7..d14d893 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 4669dee..417b2f7 100644 +index 654be21..618e76e 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 -@@ -211,6 +211,6 @@ public class UpstreamBridge extends PacketHandler +@@ -213,6 +213,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 df525fb..60e3562 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 6160bd409a7759a460bddb26dae0dfc36a0680a4 Mon Sep 17 00:00:00 2001 +From 68af736ef6664d9e53c126cc7e43fbc6ec60afa7 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 @@ -34,7 +34,7 @@ index 0000000..d294dda +} \ No newline at end of file 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 417b2f7..3c3fd98 100644 +index 618e76e..9e753d5 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 @@ @@ -45,10 +45,10 @@ index 417b2f7..3c3fd98 100644 import java.util.ArrayList; import java.util.List; import net.md_5.bungee.BungeeCord; -@@ -112,6 +113,7 @@ public class UpstreamBridge extends PacketHandler - public void handle(Chat chat) throws Exception +@@ -114,6 +115,7 @@ public class UpstreamBridge extends PacketHandler { - Preconditions.checkArgument( chat.getMessage().length() <= 100, "Chat message too long" ); // Mojang limit, check on updates + 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 + Preconditions.checkArgument(!StringUtil.isBlank(chat.getMessage()), "Chat message is empty"); ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );