From 94c978ecf5d8f9226b5464f5532968c98ccadea3 Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Tue, 31 May 2011 00:27:39 +0200 Subject: [PATCH] minor tweaks --- MobArena.jar | Bin 23018 -> 23273 bytes src/com/garbagemule/MobArena/MACommands.java | 54 ++++++++++++------- src/com/garbagemule/MobArena/MAUtils.java | 14 ++++- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/MobArena.jar b/MobArena.jar index 0ab0b20b2e2d32d2305b473378ea30ecb24f287a..44542fca4ed0c28dd6d1665319aa330763ea1bb2 100644 GIT binary patch delta 7917 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 delta 7679 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 + // ma expandregion [up|down|out] if (cmd.equalsIgnoreCase("expandregion")) { - if (arg.equals("up") || arg.equals("down") || arg.equals("out")) + if (ArenaManager.p1 == null || ArenaManager.p2 == null) { - if (args.length != 3 || !args[2].matches("[0-9]+")) - return false; - - int i = Integer.parseInt(args[2]); - MAUtils.expandRegion(arg, i); - - ArenaManager.tellPlayer(p, "Region expanded " + arg + " by " + i + " blocks."); + ArenaManager.tellPlayer(p, "Set up region points first: /ma setregion [p1|p2]"); return true; } - ArenaManager.tellPlayer(p, "Region point \"" + arg + "\" set."); + if (!arg.equals("up") && !arg.equals("down") && !arg.equals("out")) + { + ArenaManager.tellPlayer(p, "/ma expandregion [up|down|out] "); + return true; + } + + if (args.length != 3 || !args[2].matches("[0-9]+")) + return false; + + int i = Integer.parseInt(args[2]); + MAUtils.expandRegion(arg, i); + + ArenaManager.tellPlayer(p, "Region expanded " + arg + " by " + i + " blocks."); return true; } diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java index 2672f7f..9de3cb2 100644 --- a/src/com/garbagemule/MobArena/MAUtils.java +++ b/src/com/garbagemule/MobArena/MAUtils.java @@ -481,6 +481,18 @@ public class MAUtils (ArenaManager.dCreepers != -1) && (ArenaManager.classes.size() > 0) && (ArenaManager.spawnpoints.size() > 0)); - + } + + /** + * Verifies that all important variables are declared. Returns true + * if, and only if, the warppoints, region, distribution coefficients, + * classes and spawnpoints are all set up. + */ + public static void notifyIfSetup(Player p) + { + if (verifyData()) + { + ArenaManager.tellPlayer(p, "MobArena is set up and ready to roll!"); + } } } \ No newline at end of file