From efc66820c63fe2a4b97615bf4bfc9ca5c2be28f9 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Sat, 19 Sep 2020 10:57:17 +0200 Subject: [PATCH] Add specific Msg value for `/ma addreward`. This commit introduces a new announcement value for the `addreward` command. This allows server owners to completely remove the message by setting it to the empty string while retaining wave reward messages. In general, we shouldn't reuse announcements unless the actions that send them are identical, because it makes everything a lot more tangled than it has to be. --- src/main/java/com/garbagemule/MobArena/Msg.java | 1 + .../garbagemule/MobArena/commands/admin/AddRewardCommand.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/garbagemule/MobArena/Msg.java b/src/main/java/com/garbagemule/MobArena/Msg.java index 90b9e4e..c2e7286 100644 --- a/src/main/java/com/garbagemule/MobArena/Msg.java +++ b/src/main/java/com/garbagemule/MobArena/Msg.java @@ -78,6 +78,7 @@ public enum Msg { WAVE_BOSS_KILLED("&a%&r killed the boss!"), WAVE_BOSS_REWARD_EARNED("You earned: &e%"), WAVE_REWARD("You just earned a reward: &e%&r"), + MISC_REWARD_ADDED("You were just given a reward: &e%&r"), MISC_LIST_PLAYERS("Live players: &a%&r"), MISC_LIST_ARENAS("Available arenas: %"), MISC_COMMAND_NOT_ALLOWED("You can't use that command in the arena!"), diff --git a/src/main/java/com/garbagemule/MobArena/commands/admin/AddRewardCommand.java b/src/main/java/com/garbagemule/MobArena/commands/admin/AddRewardCommand.java index 0d9b117..2c19818 100644 --- a/src/main/java/com/garbagemule/MobArena/commands/admin/AddRewardCommand.java +++ b/src/main/java/com/garbagemule/MobArena/commands/admin/AddRewardCommand.java @@ -64,7 +64,7 @@ public class AddRewardCommand implements Command { } arena.getRewardManager().addReward(player, thing); - arena.getMessenger().tell(player, Msg.WAVE_REWARD, thing.toString()); + arena.getMessenger().tell(player, Msg.MISC_REWARD_ADDED, thing.toString()); String msg = "Added " + ChatColor.YELLOW + thing + ChatColor.RESET + " to " + ChatColor.YELLOW + player.getName() + "'s" + ChatColor.RESET + " rewards."; am.getGlobalMessenger().tell(sender, msg);