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

Readd aliases for global chat

This commit is contained in:
cswhite2000 2018-12-08 04:38:08 -08:00
parent deaac2839b
commit de85f9f726
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ public class ChannelCommands implements Commands, Listener {
} }
@Command( @Command(
aliases = "g", aliases = { "g", "shout" },
desc = "Send a message to everyone on the local server.", desc = "Send a message to everyone on the local server.",
usage = "[message...]" usage = "[message...]"
) )
@ -87,12 +87,22 @@ 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();
if (message.startsWith("!")) {
channel = channelRouter.getChannel(ChatDoc.Type.SERVER).get();
message = message.substring(1);
} else if (message.startsWith("@a ")) {
channel = channelRouter.getChannel(ChatDoc.Type.SERVER).get();
message = message.substring(3);
}
if(!channel.sendable(player)) { if(!channel.sendable(player)) {
// If player cannot chat in their preferred channel, // If player cannot chat in their preferred channel,
// 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, event.getMessage()); channel.chat(player, message);
}); });
} }