v0.89.2 - Fixed force end command

This commit is contained in:
Garbage Mule
2011-06-05 16:21:10 +02:00
parent d03e56f915
commit fe54473f6d
5 changed files with 9 additions and 8 deletions
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
name: MobArena name: MobArena
main: com.garbagemule.MobArena.MobArena main: com.garbagemule.MobArena.MobArena
version: 0.89.1 version: 0.89.2
commands: commands:
ma: ma:
description: Base command for MobArena description: Base command for MobArena
+4 -2
View File
@@ -1,6 +1,7 @@
package com.garbagemule.MobArena; package com.garbagemule.MobArena;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@@ -140,8 +141,9 @@ public class MACommands implements CommandExecutor
} }
// End the arena. // End the arena.
for (Player player : ArenaManager.playerSet) Iterator<Player> iterator = ArenaManager.playerSet.iterator();
ArenaManager.playerLeave(player); while (iterator.hasNext())
ArenaManager.playerLeave(iterator.next());
ArenaManager.tellPlayer(p, "Forced arena end."); ArenaManager.tellPlayer(p, "Forced arena end.");
return true; return true;
} }
@@ -272,10 +272,7 @@ public class MAUtils
List<String> result = new LinkedList<String>(); List<String> result = new LinkedList<String>();
for (String s : commands.split(",")) for (String s : commands.split(","))
{
System.out.println(s.trim());
result.add(s.trim()); result.add(s.trim());
}
return result; return result;
} }
+4 -2
View File
@@ -1,6 +1,7 @@
package com.garbagemule.MobArena; package com.garbagemule.MobArena;
import java.util.List; import java.util.List;
import java.util.Iterator;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.Event.Priority; import org.bukkit.event.Event.Priority;
@@ -76,8 +77,9 @@ public class MobArena extends JavaPlugin
public void onDisable() public void onDisable()
{ {
for (Player p : ArenaManager.playerSet) Iterator<Player> iterator = ArenaManager.playerSet.iterator();
ArenaManager.playerLeave(p); while (iterator.hasNext())
ArenaManager.playerLeave(iterator.next());
System.out.println("WAIT! WHAT ARE YOU DOING?!"); System.out.println("WAIT! WHAT ARE YOU DOING?!");
} }