From bbbc46f207c10d74d04ffa4009bb4463e86107ba Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Thu, 7 Jul 2011 12:07:21 +0200 Subject: [PATCH] Made /ma join a little neater. --- MobArena.jar | Bin 79242 -> 79219 bytes src/com/garbagemule/MobArena/ArenaMaster.java | 9 ++ src/com/garbagemule/MobArena/MACommands.java | 120 ++++++------------ 3 files changed, 51 insertions(+), 78 deletions(-) diff --git a/MobArena.jar b/MobArena.jar index 8fb5cdbd1ec1eca4e8307f21dcac80064a9f3ef0..2992d73bd4d5b8ad74f6f6ec7b415bdc75a005f8 100644 GIT binary patch delta 16966 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 delta 16992 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 ZX+VSpOd0JNpG*%hWt3%;&}9TV9{?%cZmR$Q diff --git a/src/com/garbagemule/MobArena/ArenaMaster.java b/src/com/garbagemule/MobArena/ArenaMaster.java index a8da1fd..6b16482 100644 --- a/src/com/garbagemule/MobArena/ArenaMaster.java +++ b/src/com/garbagemule/MobArena/ArenaMaster.java @@ -58,6 +58,15 @@ public class ArenaMaster // /////////////////////////////////////////////////////////////////////////*/ + public List getEnabledArenas() + { + List result = new LinkedList(); + for (Arena arena : arenas) + if (arena.enabled) + result.add(arena); + return result; + } + public Arena getArenaInLocation(Location loc) { for (Arena arena : arenas) diff --git a/src/com/garbagemule/MobArena/MACommands.java b/src/com/garbagemule/MobArena/MACommands.java index d01391f..6205b3c 100644 --- a/src/com/garbagemule/MobArena/MACommands.java +++ b/src/com/garbagemule/MobArena/MACommands.java @@ -120,90 +120,54 @@ public class MACommands implements CommandExecutor 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; if (!arg1.isEmpty()) - { - Arena arena = am.getArenaWithName(arg1); - - // Crap-load of sanity-checks. - if (!am.enabled) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_NOT_ENABLED)); - 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) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_NOT_SETUP)); - else if (arena.running) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_IS_RUNNING)); - else if (arena.livePlayers.contains(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ALREADY_PLAYING)); - else if (arena.playerLimit > 0 && arena.livePlayers.size() >= arena.playerLimit) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_PLAYER_LIMIT_REACHED)); - else if (arena.emptyInvJoin && !MAUtils.hasEmptyInventory(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_EMPTY_INV)); - else if (!arena.emptyInvJoin && !MAUtils.storeInventory(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_STORE_INV_FAIL)); - else error = false; - - // If there was an error, don't join. - if (error) - return true; - - am.arenaMap.put(p,arena); - arena.playerJoin(p, p.getLocation()); - - MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_PLAYER_JOINED)); - return true; - } + arena = am.getArenaWithName(arg1); + else if (arenas.size() == 1) + arena = arenas.get(0); else - { - if (am.arenas.size() < 1) - { - MAUtils.tellPlayer(sender, "There are no arenas loaded. Check your config-file."); - return true; - } - - Arena arena = am.arenas.get(0); - - if (!am.enabled) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_NOT_ENABLED)); - 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 (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) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_NOT_SETUP)); - else if (arena.running) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_IS_RUNNING)); - else if (arena.livePlayers.contains(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ALREADY_PLAYING)); - else if (arena.playerLimit > 0 && arena.livePlayers.size() >= arena.playerLimit) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_PLAYER_LIMIT_REACHED)); - else if (arena.emptyInvJoin && !MAUtils.hasEmptyInventory(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_EMPTY_INV)); - else if (!arena.emptyInvJoin && !MAUtils.storeInventory(p)) - error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_STORE_INV_FAIL)); - else error = false; - - // If there was an error, don't join. - if (error) - return true; - - am.arenaMap.put(p,arena); - arena.playerJoin(p, p.getLocation()); - - MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_PLAYER_JOINED)); + 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.running) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ARENA_IS_RUNNING)); + else if (arena.livePlayers.contains(p)) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_ALREADY_PLAYING)); + else if (arena.playerLimit > 0 && arena.livePlayers.size() >= arena.playerLimit) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_PLAYER_LIMIT_REACHED)); + else if (arena.emptyInvJoin && !MAUtils.hasEmptyInventory(p)) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_EMPTY_INV)); + else if (!arena.emptyInvJoin && !MAUtils.storeInventory(p)) + error = MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_STORE_INV_FAIL)); + else error = false; + + // If there was an error, don't join. + if (error) return true; - } + + am.arenaMap.put(p,arena); + arena.playerJoin(p, p.getLocation()); + + MAUtils.tellPlayer(p, MAMessages.get(Msg.JOIN_PLAYER_JOINED)); + return true; } /*