Ignore empty chat messages (#5)
* Ignore empty chat messages * Give an error message for empty messages
This commit is contained in:
parent
de85f9f726
commit
f57faddc42
|
@ -87,14 +87,14 @@ public class ChannelCommands implements Commands, Listener {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
syncPlayerExecutorFactory.queued(event.getPlayer()).execute(player -> {
|
syncPlayerExecutorFactory.queued(event.getPlayer()).execute(player -> {
|
||||||
Channel channel = channelRouter.getDefaultChannel(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();
|
channel = channelRouter.getChannel(ChatDoc.Type.SERVER).get();
|
||||||
message = message.substring(1);
|
message = message.substring(1).trim();
|
||||||
} else if (message.startsWith("@a ")) {
|
} else if(message.startsWith("@a ")) {
|
||||||
channel = channelRouter.getChannel(ChatDoc.Type.SERVER).get();
|
channel = channelRouter.getChannel(ChatDoc.Type.SERVER).get();
|
||||||
message = message.substring(3);
|
message = message.substring(3).trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!channel.sendable(player)) {
|
if(!channel.sendable(player)) {
|
||||||
|
@ -102,7 +102,11 @@ public class ChannelCommands implements Commands, Listener {
|
||||||
// assume they can send to the default channel.
|
// assume they can send to the default channel.
|
||||||
channel = channelRouter.getDefaultChannel();
|
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);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -185,6 +185,7 @@ misc.appeals.plural = appeals
|
||||||
channels.default.alreadySet = Your default channel is already {0} chat
|
channels.default.alreadySet = Your default channel is already {0} chat
|
||||||
channels.default.set = Your default channel is now {0} chat
|
channels.default.set = Your default channel is now {0} chat
|
||||||
channels.unavailable = {0} chat is currently unavailable.
|
channels.unavailable = {0} chat is currently unavailable.
|
||||||
|
channels.message.empty = Messages cannot be empty!
|
||||||
|
|
||||||
misc.enabled = enabled
|
misc.enabled = enabled
|
||||||
misc.disabled = disabled
|
misc.disabled = disabled
|
||||||
|
|
Loading…
Reference in New Issue