diff --git a/MobArena.jar b/MobArena.jar index e8350f1..f135763 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/bin/plugin.yml b/bin/plugin.yml index c4417db..6e9a539 100644 --- a/bin/plugin.yml +++ b/bin/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.89.1 +version: 0.89.2 commands: ma: description: Base command for MobArena diff --git a/src/com/garbagemule/MobArena/MACommands.java b/src/com/garbagemule/MobArena/MACommands.java index 301835a..c5fe46b 100644 --- a/src/com/garbagemule/MobArena/MACommands.java +++ b/src/com/garbagemule/MobArena/MACommands.java @@ -1,6 +1,7 @@ package com.garbagemule.MobArena; import java.util.Arrays; +import java.util.Iterator; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; @@ -140,8 +141,9 @@ public class MACommands implements CommandExecutor } // End the arena. - for (Player player : ArenaManager.playerSet) - ArenaManager.playerLeave(player); + Iterator iterator = ArenaManager.playerSet.iterator(); + while (iterator.hasNext()) + ArenaManager.playerLeave(iterator.next()); ArenaManager.tellPlayer(p, "Forced arena end."); return true; } diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java index 120fdca..e8b18d6 100644 --- a/src/com/garbagemule/MobArena/MAUtils.java +++ b/src/com/garbagemule/MobArena/MAUtils.java @@ -272,10 +272,7 @@ public class MAUtils List result = new LinkedList(); for (String s : commands.split(",")) - { - System.out.println(s.trim()); result.add(s.trim()); - } return result; } diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java index c7158ab..a3b0899 100644 --- a/src/com/garbagemule/MobArena/MobArena.java +++ b/src/com/garbagemule/MobArena/MobArena.java @@ -1,6 +1,7 @@ package com.garbagemule.MobArena; import java.util.List; +import java.util.Iterator; import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.Event.Priority; @@ -76,8 +77,9 @@ public class MobArena extends JavaPlugin public void onDisable() { - for (Player p : ArenaManager.playerSet) - ArenaManager.playerLeave(p); + Iterator iterator = ArenaManager.playerSet.iterator(); + while (iterator.hasNext()) + ArenaManager.playerLeave(iterator.next()); System.out.println("WAIT! WHAT ARE YOU DOING?!"); }