Make union chat /u
This commit is contained in:
1 parent
240a1fc42d
commit
3f13f63c18
3 files changed
+29
-3
No files matched your search
@@ -25,12 +25,38 @@ public class ChatCommand extends BaseCommand {
|
||||
|
||||
@Default
|
||||
@HelpSearchTags("chat")
|
||||
public void sendMessage(ClanPlayer cp, @Name("message") String message) {
|
||||
public void sendMessage(ClanPlayer cp, @Optional @Name("message") String message) {
|
||||
|
||||
if (message == null || message.isBlank()) {
|
||||
|
||||
toggle(cp);
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
chatManager.processChat(SPIGOT, CLAN, cp, message);
|
||||
|
||||
}
|
||||
|
||||
// Bare command flips the player in or out of the union chat channel.
|
||||
private void toggle(ClanPlayer clanPlayer) {
|
||||
|
||||
if (clanPlayer.getChannel() == CLAN) {
|
||||
|
||||
clanPlayer.setChannel(NONE);
|
||||
storageManager.updateClanPlayer(clanPlayer);
|
||||
ChatBlock.sendMessage(clanPlayer, lang("left.clan.chat", clanPlayer));
|
||||
|
||||
} else {
|
||||
|
||||
clanPlayer.setChannel(CLAN);
|
||||
storageManager.updateClanPlayer(clanPlayer);
|
||||
ChatBlock.sendMessage(clanPlayer, lang("joined.clan.chat"));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Subcommand("%join")
|
||||
public void join(ClanPlayer clanPlayer) {
|
||||
|
||||
|
||||
@@ -467,7 +467,7 @@ public final class SettingsManager {
|
||||
COMMANDS_MORE("commands.more", "more"), COMMANDS_ALLY("commands.ally", "ally"),
|
||||
COMMANDS_CLAN("commands.clan", "clan"), COMMANDS_ACCEPT("commands.accept", "accept"),
|
||||
COMMANDS_DENY("commands.deny", "deny"), COMMANDS_GLOBAL("commands.global", "global"),
|
||||
COMMANDS_CLAN_CHAT("commands.clan_chat", "."), COMMANDS_FORCE_PRIORITY("commands.force-priority", true),
|
||||
COMMANDS_CLAN_CHAT("commands.clan_chat", "u"), COMMANDS_FORCE_PRIORITY("commands.force-priority", true),
|
||||
/*
|
||||
* ================ > Economy Settings ================
|
||||
*
|
||||
|
||||
@@ -100,7 +100,7 @@ commands:
|
||||
accept: accept
|
||||
deny: deny
|
||||
global: global
|
||||
clan_chat: "."
|
||||
clan_chat: u
|
||||
force-priority: true
|
||||
economy:
|
||||
creation-price: 100.0
|
||||
|
||||
Reference in new issue
Block a user