From 8c157af7bcc032ddaf9b5362fa28e69fdf317f40 Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Fri, 8 Jul 2011 19:22:35 +0200 Subject: [PATCH] v0.92.2 Bugfixes and a couple of extras. --- MobArena.jar | Bin 79805 -> 79737 bytes bin/plugin.yml | 2 +- src/com/garbagemule/MobArena/MACommands.java | 70 +++++++++---------- 3 files changed, 35 insertions(+), 37 deletions(-) diff --git a/MobArena.jar b/MobArena.jar index cb7f1e0116c34a35051d0a0824414dea3784448d..fba82a714b494c1bf770ff35dfee5feac6d7457a 100644 GIT binary patch delta 12141 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 diff --git a/bin/plugin.yml b/bin/plugin.yml index 6e884e4..5a8c718 100644 --- a/bin/plugin.yml +++ b/bin/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.92.1 +version: 0.92.2 softdepend: [MultiVerse,XcraftGate] commands: ma: diff --git a/src/com/garbagemule/MobArena/MACommands.java b/src/com/garbagemule/MobArena/MACommands.java index b217e3e..c347ed6 100644 --- a/src/com/garbagemule/MobArena/MACommands.java +++ b/src/com/garbagemule/MobArena/MACommands.java @@ -206,54 +206,52 @@ public class MACommands implements CommandExecutor * Player spectate */ if (base.equals("spectate") || base.equals("spec")) - { + { if (!player || !MobArena.has(p, "mobarena.use.spectate")) { MAUtils.tellPlayer(sender, MAMessages.get(Msg.MISC_NO_ACCESS)); return true; } + List arenas = am.getEnabledArenas(); + if (!am.enabled || arenas.size() < 1) + { + MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_NOT_ENABLED)); + return true; + } boolean error; - Arena arena = null; + Arena arena; if (!arg1.isEmpty()) - { arena = am.getArenaWithName(arg1); - - if (!am.enabled) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_NOT_ENABLED)); - else if (am.arenaMap.containsKey(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.SPEC_ALREADY_PLAYING)); - else if (arena == null) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.ARENA_DOES_NOT_EXIST)); - else if (arena.emptyInvSpec && !MAUtils.hasEmptyInventory(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.SPEC_EMPTY_INV)); - else error = false; - - if (error) - return true; - } + else if (arenas.size() == 1) + arena = arenas.get(0); else - { - arena = am.arenas.get(0); - - if (!am.enabled) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_NOT_ENABLED)); - else if (am.arenaMap.containsKey(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.SPEC_ALREADY_PLAYING)); - else if (am.arenas.size() > 1) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARG_NEEDED)); - else if (arena == null) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.ARENA_DOES_NOT_EXIST)); - else if (arena.emptyInvSpec && !MAUtils.hasEmptyInventory(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.SPEC_EMPTY_INV)); - else error = false; - - if (error) - return true; - } - + arena = null; + + if (arenas.size() > 1 && arg1.isEmpty()) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARG_NEEDED)); + else if (arena == null) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.ARENA_DOES_NOT_EXIST)); + else if (am.arenaMap.containsKey(p) && am.arenaMap.get(p).livePlayers.contains(p)) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_IN_OTHER_ARENA)); + else if (!arena.enabled) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_NOT_ENABLED)); + else if (!arena.setup || arena.edit) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_NOT_SETUP)); + else if (arena.livePlayers.contains(p)) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.SPEC_ALREADY_PLAYING)); + else if (arena.emptyInvSpec && !MAUtils.hasEmptyInventory(p)) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.SPEC_EMPTY_INV)); + else error = false; + + // If there was an error, don't join. + if (error) + return true; + + am.arenaMap.put(p,arena); arena.playerSpec(p, p.getLocation()); + MAUtils.tellPlayer(p, MAMessages.get(Msg.SPEC_PLAYER_SPECTATE)); return true; }