mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-09-30 07:27:28 +02:00
be3a798a36
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: f5157f12 #3438: Fix possible race condition in duplicate player check df20effa #3557: Replace Guava Charsets with Java StandardCharsets
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 88834135061418ae8c007a335e2c0e5772f52ce5 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 6acbf7bf..05e3bd21 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
|
|
@@ -199,6 +199,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 );
|
|
@@ -206,8 +207,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.1
|
|
|