From f57faddc4245b231f5681ae9d57c6f87779525b4 Mon Sep 17 00:00:00 2001 From: Christopher White Date: Mon, 17 Dec 2018 15:44:03 -0800 Subject: [PATCH] Ignore empty chat messages (#5) * Ignore empty chat messages * Give an error message for empty messages --- .../commons/bukkit/channels/ChannelCommands.java | 16 ++++++++++------ .../i18n/templates/commons/Commons.properties | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java index b1fbe50..503010d 100644 --- a/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java +++ b/Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java @@ -87,14 +87,14 @@ public class ChannelCommands implements Commands, Listener { event.setCancelled(true); syncPlayerExecutorFactory.queued(event.getPlayer()).execute(player -> { Channel channel = channelRouter.getDefaultChannel(player); - String message = event.getMessage(); + String message = event.getMessage().trim(); - if (message.startsWith("!")) { + if(message.startsWith("!")) { channel = channelRouter.getChannel(ChatDoc.Type.SERVER).get(); - message = message.substring(1); - } else if (message.startsWith("@a ")) { + message = message.substring(1).trim(); + } else if(message.startsWith("@a ")) { channel = channelRouter.getChannel(ChatDoc.Type.SERVER).get(); - message = message.substring(3); + message = message.substring(3).trim(); } if(!channel.sendable(player)) { @@ -102,7 +102,11 @@ public class ChannelCommands implements Commands, Listener { // assume they can send to the default channel. channel = channelRouter.getDefaultChannel(); } - channel.chat(player, message); + if(!message.isEmpty()) { + channel.chat(player, message); + } else { + audiences.get(player).sendWarning(new TranslatableComponent("channels.message.empty"), false); + } }); } diff --git a/Commons/core/src/main/i18n/templates/commons/Commons.properties b/Commons/core/src/main/i18n/templates/commons/Commons.properties index e70b553..e7cfe73 100644 --- a/Commons/core/src/main/i18n/templates/commons/Commons.properties +++ b/Commons/core/src/main/i18n/templates/commons/Commons.properties @@ -185,6 +185,7 @@ misc.appeals.plural = appeals channels.default.alreadySet = Your default channel is already {0} chat channels.default.set = Your default channel is now {0} chat channels.unavailable = {0} chat is currently unavailable. +channels.message.empty = Messages cannot be empty! misc.enabled = enabled misc.disabled = disabled