From 717477afec66d224d30c99ddc768cc5254ebaf6d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 26 May 2020 12:36:04 +0100 Subject: [PATCH] Updated Upstream (BungeeCord) 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: 2f54c943 #2786: Should first peek keepalive queue --- BungeeCord | 2 +- ...ic-support-for-configurable-tab-complete-thro.patch | 8 ++++---- .../0020-Improve-server-list-ping-logging.patch | 10 +++++----- ...024-Validate-that-chat-messages-are-non-blank.patch | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/BungeeCord b/BungeeCord index 67c2dfd..2f54c94 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 67c2dfd8848689c6d5052fbc99b3bc92a6d21ea2 +Subproject commit 2f54c943720aea0c2c83049a37644fd67f6718bb 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 ed0a7bb..2132124 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 1f2f759843f42eea8962ed3a0bb6be82bd17022c Mon Sep 17 00:00:00 2001 +From c931ce5a2f95001b88cf81d6b3a117ff704c838c 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 @@ -73,7 +73,7 @@ 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 6b888c85..c7e1a621 100644 +index d93efd87..31777d93 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 @@ -38,6 +38,8 @@ public class UpstreamBridge extends PacketHandler @@ -85,7 +85,7 @@ index 6b888c85..c7e1a621 100644 public UpstreamBridge(ProxyServer bungee, UserConnection con) { this.bungee = bungee; -@@ -156,6 +158,20 @@ public class UpstreamBridge extends PacketHandler +@@ -157,6 +159,20 @@ public class UpstreamBridge extends PacketHandler @Override public void handle(TabCompleteRequest tabComplete) throws Exception { @@ -107,5 +107,5 @@ index 6b888c85..c7e1a621 100644 if ( tabComplete.getCursor().startsWith( "/" ) ) -- -2.25.0 +2.26.2 diff --git a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch index 6403251..3cf77a9 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 51ae3b4db60a3e32284f940a05db847890e16e65 Mon Sep 17 00:00:00 2001 +From e46e3a153135557d4e3c3566bd4ae1960f4e2e60 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 @@ -31,7 +31,7 @@ index ea905b07..6598781b 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 9b9641d2..1109a9b5 100644 +index 5496a799..a9779fcc 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 @@ -653,20 +653,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -57,10 +57,10 @@ index 9b9641d2..1109a9b5 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 c7e1a621..d44d4c2e 100644 +index 31777d93..cc141a11 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 -@@ -270,6 +270,6 @@ public class UpstreamBridge extends PacketHandler +@@ -271,6 +271,6 @@ public class UpstreamBridge extends PacketHandler @Override public String toString() { @@ -69,5 +69,5 @@ index c7e1a621..d44d4c2e 100644 } } -- -2.26.0 +2.26.2 diff --git a/BungeeCord-Patches/0024-Validate-that-chat-messages-are-non-blank.patch b/BungeeCord-Patches/0024-Validate-that-chat-messages-are-non-blank.patch index fae2e59..59ff1ac 100644 --- a/BungeeCord-Patches/0024-Validate-that-chat-messages-are-non-blank.patch +++ b/BungeeCord-Patches/0024-Validate-that-chat-messages-are-non-blank.patch @@ -1,4 +1,4 @@ -From fd2323156681ae38aeea32eb4c7b1f2141c4be93 Mon Sep 17 00:00:00 2001 +From 344390c0a58152ef43ad574901330337406d41cf 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 d44d4c2e..4d8bac5d 100644 +index cc141a11..7913d40c 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 d44d4c2e..4d8bac5d 100644 import io.netty.channel.Channel; import java.util.ArrayList; import java.util.LinkedList; -@@ -142,6 +143,7 @@ public class UpstreamBridge extends PacketHandler +@@ -143,6 +144,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 d44d4c2e..4d8bac5d 100644 ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() ); if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() ) -- -2.25.0 +2.26.2