mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-06-29 07:54:48 +02:00
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From e497a697d54e977d9ee969852cd84011c70bf435 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 c30093d7..7fb79bfd 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
|
|
@@ -188,6 +188,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 );
|
|
@@ -195,8 +196,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.40.0
|
|
|