tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Ignore empty chat messages (#5) 

* Ignore empty chat messages

* Give an error message for empty messages
This commit is contained in:
Christopher White 2018-12-17 15:44:03 -08:00 committed by Austin Mayes
parent de85f9f726
commit f57faddc42
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/channels/ChannelCommands.java
View File

@ -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);
}
});
}

1
Commons/core/src/main/i18n/templates/commons/Commons.properties
View File

@ -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