diff --git a/MobArena.jar b/MobArena.jar index 05396c8..86938d6 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/bin/plugin.yml b/bin/plugin.yml index b12ba4c..ec59d03 100644 --- a/bin/plugin.yml +++ b/bin/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.87 +version: 0.87.1 commands: mobarena: description: Base command for MobArena diff --git a/src/com/garbagemule/MobArena/MACommands.java b/src/com/garbagemule/MobArena/MACommands.java index a1db061..e722e3c 100644 --- a/src/com/garbagemule/MobArena/MACommands.java +++ b/src/com/garbagemule/MobArena/MACommands.java @@ -146,10 +146,11 @@ public class MACommands implements CommandExecutor if (MAUtils.getCoords("spawnpoints." + arg) == null) { ArenaManager.tellPlayer(p, "Couldn't find spawnpoint \"" + arg + "\"."); + ArenaManager.tellPlayer(p, "Spawnpoints: " + MAUtils.spawnList()); return true; } - MAUtils.delCoords("spawnpoints." + arg); + MAUtils.delCoords("coords.spawnpoints." + arg); ArenaManager.tellPlayer(p, "Spawn point with name \"" + arg + "\" removed."); MAUtils.notifyIfSetup(p); @@ -197,6 +198,17 @@ public class MACommands implements CommandExecutor return true; } + // ma reset coords + if (cmd.equals("reset")) + { + if (!arg.equals("coords")) + return false; + + MAUtils.delCoords("coords"); + ArenaManager.tellPlayer(p, "All arena coords have been reset."); + return true; + } + // ma protect true/false if (cmd.equals("protect")) { diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java index f8e13e3..e5c3f02 100644 --- a/src/com/garbagemule/MobArena/MAUtils.java +++ b/src/com/garbagemule/MobArena/MAUtils.java @@ -377,7 +377,7 @@ public class MAUtils /** * Removes coordinate information from the config-file. - */ + */ public static void delCoords(String name) { Configuration c = ArenaManager.config; @@ -473,6 +473,21 @@ public class MAUtils fixCoords(); } + public static String spawnList() + { + Configuration c = ArenaManager.config; + c.load(); + + String result = ""; + if (c.getKeys("coords.spawnpoints") == null) + return result; + + for (String s : c.getKeys("coords.spawnpoints")) + result += s + " "; + + return result; + } + /* ///////////////////////////////////////////////////////////////////// // diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java index 31be5a0..a28ac7c 100644 --- a/src/com/garbagemule/MobArena/MobArena.java +++ b/src/com/garbagemule/MobArena/MobArena.java @@ -21,7 +21,7 @@ public class MobArena extends JavaPlugin * or Mean Admins. */ public final String[] COMMANDS = {"join", "j", "leave", "l", "list", "who", "spectate", "spec", "setwarp", "addspawn", "delspawn", "setregion", "expandregion", - "protect", "undo", "dooooo"}; + "protect", "undo", "dooooo", "reset"}; public MobArena() {