From 13948e75548b98d919bf9bd9523a18b6ff6944e0 Mon Sep 17 00:00:00 2001 From: garbagemule Date: Tue, 30 Jul 2013 23:04:49 +0200 Subject: [PATCH] Add global first-join announce feature. --- resources/plugin.yml | 2 +- resources/res/settings.yml | 1 + src/com/garbagemule/MobArena/ArenaImpl.java | 11 ++++++++++- src/com/garbagemule/MobArena/Msg.java | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/resources/plugin.yml b/resources/plugin.yml index 10e93f1..802a689 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,7 +1,7 @@ name: MobArena author: garbagemule main: com.garbagemule.MobArena.MobArena -version: 0.95.5.3 +version: 0.95.5.4 softdepend: [Spout,Towny,Heroes,MagicSpells,Vault] commands: ma: diff --git a/resources/res/settings.yml b/resources/res/settings.yml index f880e96..8c01342 100644 --- a/resources/res/settings.yml +++ b/resources/res/settings.yml @@ -39,4 +39,5 @@ display-waves-as-level: false display-timer-as-level: false use-scoreboards: true isolated-chat: false +global-first-join-announce: false global-end-announce: false diff --git a/src/com/garbagemule/MobArena/ArenaImpl.java b/src/com/garbagemule/MobArena/ArenaImpl.java index d379d01..b373a53 100644 --- a/src/com/garbagemule/MobArena/ArenaImpl.java +++ b/src/com/garbagemule/MobArena/ArenaImpl.java @@ -559,7 +559,16 @@ public class ArenaImpl implements Arena if (event.isCancelled()) { return false; } - + + // Announce globally (must happen before moving player) + if (settings.getBoolean("global-first-join-announce", false)) { + if (lobbyPlayers.isEmpty()) { + for (Player q : Bukkit.getOnlinePlayers()) { + Messenger.tellPlayer(q, Msg.ARENA_JOIN_GLOBAL, configName()); + } + } + } + takeFee(p); storePlayerData(p, loc); removePotionEffects(p); diff --git a/src/com/garbagemule/MobArena/Msg.java b/src/com/garbagemule/MobArena/Msg.java index 5740db7..277362a 100644 --- a/src/com/garbagemule/MobArena/Msg.java +++ b/src/com/garbagemule/MobArena/Msg.java @@ -7,6 +7,7 @@ public enum Msg ARENA_START("Let the slaughter begin!", "Arena started!", Material.REDSTONE_TORCH_ON), ARENA_END("Arena finished.", "Arena finished.", Material.REDSTONE_TORCH_OFF), ARENA_END_GLOBAL("Arena '%' finished! Type /ma j % to join a new game!"), + ARENA_JOIN_GLOBAL("Arena '%' is about to start! Type /ma j % to join!"), ARENA_DOES_NOT_EXIST("That arena does not exist. Type /ma arenas for a list.", "Can't find arena."), ARENA_LBOARD_NOT_FOUND("That arena does not have a leaderboard set up."), ARENA_AUTO_START("Arena will auto-start in % seconds."),