mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-11 03:25:07 +01:00
8d41d21148
Upstream has released updates that appear 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: 653f1691 Print full stack trace for packet decoder errors 3cb7a127 #3527: Switching between servers causes a decoding error
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From edcda91b4d88b9f37535a113a73922709b86527a Mon Sep 17 00:00:00 2001
|
|
From: Tux <write@imaginarycode.com>
|
|
Date: Tue, 25 Oct 2016 12:34:41 -0400
|
|
Subject: [PATCH] Validate that chat messages are non-blank
|
|
|
|
|
|
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 37178082..57d09507 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
|
|
@@ -198,6 +198,7 @@ public class UpstreamBridge extends PacketHandler
|
|
|
|
private String handleChat(String message)
|
|
{
|
|
+ boolean empty = true;
|
|
for ( int index = 0, length = message.length(); index < length; index++ )
|
|
{
|
|
char c = message.charAt( index );
|
|
@@ -205,8 +206,14 @@ public class UpstreamBridge extends PacketHandler
|
|
{
|
|
con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
|
|
throw CancelSendSignal.INSTANCE;
|
|
+ } else if (empty && !Character.isWhitespace(c)) {
|
|
+ empty = false;
|
|
}
|
|
}
|
|
+ if (empty) {
|
|
+ con.disconnect("Chat message is empty");
|
|
+ throw CancelSendSignal.INSTANCE;
|
|
+ }
|
|
|
|
ChatEvent chatEvent = new ChatEvent( con, con.getServer(), message );
|
|
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
|
|
--
|
|
2.42.0
|
|
|