From 780883fce7a875840101b3acd76622d63db443ef Mon Sep 17 00:00:00 2001 From: Hailey Loralyn <33793003+Haileykins@users.noreply.github.com> Date: Wed, 2 May 2018 09:10:56 -0700 Subject: [PATCH] Add boss wave on-kill announcements This commit adds two new announcements for use in boss waves: - wave-boss-killed to announce who killed the boss - wave-boss-reward-earned to notify the killer of the boss reward, if any Fixes #428 --- src/main/java/com/garbagemule/MobArena/ArenaListener.java | 8 ++++---- src/main/java/com/garbagemule/MobArena/Msg.java | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaListener.java b/src/main/java/com/garbagemule/MobArena/ArenaListener.java index e626400..6f589fe 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaListener.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaListener.java @@ -607,13 +607,13 @@ public class ArenaListener } MABoss boss = monsters.getBoss(damagee); if (boss != null) { + for (Player q : arena.getPlayersInArena()) { + arena.getMessenger().tell(q, Msg.WAVE_BOSS_KILLED, p.getName()); + } Thing reward = boss.getReward(); if (reward != null) { arena.getRewardManager().addReward(p, reward); - String msg = p.getName() + " killed the boss and won: " + reward; - for (Player q : arena.getPlayersInArena()) { - arena.getMessenger().tell(q, msg); - } + arena.getMessenger().tell(damager, Msg.WAVE_BOSS_REWARD_EARNED, reward.toString()); } } } diff --git a/src/main/java/com/garbagemule/MobArena/Msg.java b/src/main/java/com/garbagemule/MobArena/Msg.java index eb67e2a..1588291 100644 --- a/src/main/java/com/garbagemule/MobArena/Msg.java +++ b/src/main/java/com/garbagemule/MobArena/Msg.java @@ -71,6 +71,8 @@ public enum Msg { WAVE_BOSS("Wave &b#%&r! [BOSS]"), WAVE_BOSS_ABILITY("Boss used ability: &c%&r!"), WAVE_BOSS_LOW_HEALTH("Boss is almost dead!"), + 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_LIST_PLAYERS("Live players: &a%&r"), MISC_LIST_ARENAS("Available arenas: %"),