From df605b13fb320b2ee56433adbf77f5ea85be318d Mon Sep 17 00:00:00 2001
From: garbagemule <garbagemule@gmail.com>
Date: Thu, 20 Dec 2012 12:35:42 +0100
Subject: [PATCH] Import ItemStack and minor cleanup.

---
 src/com/garbagemule/MobArena/ArenaListener.java     | 13 +++++--------
 .../MobArena/listeners/MAGlobalListener.java        |  4 ++--
 src/com/garbagemule/MobArena/waves/MACreature.java  |  1 +
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/com/garbagemule/MobArena/ArenaListener.java b/src/com/garbagemule/MobArena/ArenaListener.java
index ce80078..b83a031 100644
--- a/src/com/garbagemule/MobArena/ArenaListener.java
+++ b/src/com/garbagemule/MobArena/ArenaListener.java
@@ -56,7 +56,7 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerKickEvent;
-import org.bukkit.event.player.PlayerPreLoginEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
@@ -232,12 +232,9 @@ public class ArenaListener
         // Otherwise, block was placed during a session.
         arena.addBlock(b);
 
-        switch (b.getType()){
+        if (b.getType() == Material.WOODEN_DOOR || b.getType() == Material.IRON_DOOR_BLOCK) {
             // For doors, add the block just above (so we get both halves)
-            case WOODEN_DOOR:
-            case IRON_DOOR_BLOCK:
-                arena.addBlock(b.getRelative(0, 1, 0));
-                break;
+            arena.addBlock(b.getRelative(0, 1, 0));
         }
     }
 
@@ -957,8 +954,8 @@ public class ArenaListener
         Messenger.tellPlayer(p, Msg.MISC_COMMAND_NOT_ALLOWED);
     }
 
-    public void onPlayerPreLogin(PlayerPreLoginEvent event) {
-        Player p = plugin.getServer().getPlayer(event.getName());
+    public void onPlayerPreLogin(PlayerLoginEvent event) {
+        Player p = event.getPlayer();
         if (p == null || !p.isOnline()) return;
         
         Arena arena = plugin.getArenaMaster().getArenaWithPlayer(p);
diff --git a/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java b/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java
index 221f129..7d9a17a 100644
--- a/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java
+++ b/src/com/garbagemule/MobArena/listeners/MAGlobalListener.java
@@ -228,7 +228,7 @@ public class MAGlobalListener implements Listener
         if (!am.notifyOnUpdates() || !event.getPlayer().isOp()) return;
 
         final Player p = event.getPlayer();
-        plugin.getServer().getScheduler().scheduleAsyncDelayedTask(plugin,
+        plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin,
             new Runnable()
             {
                 public void run()
@@ -295,7 +295,7 @@ public class MAGlobalListener implements Listener
     }
     
     @EventHandler(priority = EventPriority.NORMAL)
-    public void playerPreLogin(PlayerPreLoginEvent event) {
+    public void playerPreLogin(PlayerLoginEvent event) {
         for (Arena arena : am.getArenas()) {
             arena.getEventListener().onPlayerPreLogin(event);
         }
diff --git a/src/com/garbagemule/MobArena/waves/MACreature.java b/src/com/garbagemule/MobArena/waves/MACreature.java
index e6f0256..ee4ac0a 100644
--- a/src/com/garbagemule/MobArena/waves/MACreature.java
+++ b/src/com/garbagemule/MobArena/waves/MACreature.java
@@ -17,6 +17,7 @@ import org.bukkit.entity.Skeleton;
 import org.bukkit.entity.Skeleton.SkeletonType;
 import org.bukkit.entity.Slime;
 import org.bukkit.entity.Wolf;
+import org.bukkit.inventory.ItemStack;
 
 import com.garbagemule.MobArena.MobArena;
 import com.garbagemule.MobArena.framework.Arena;