diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 313735e8c..ad04d6ce5 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -5,7 +5,6 @@ import java.util.logging.*;
 import java.io.*;
 import org.bukkit.*;
 import com.earth2me.essentials.commands.IEssentialsCommand;
-import net.minecraft.server.EntityHuman;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 import org.bukkit.inventory.ItemStack;
@@ -38,11 +37,7 @@ public class User extends PlayerExtension implements Comparable<User>, IReplyTo
 	{
 		super(base);
 		this.folder = new File((Essentials.getStatic() == null ? new File(".") : Essentials.getStatic().getDataFolder()), "userdata");
-
-		if (base instanceof EntityHuman)
-		{
-			this.lastLocation = getBase().getLocation();
-		}
+		this.lastLocation = getBase().getLocation();
 		load();
 	}
 
diff --git a/lib/bukkit-0.0.1-SNAPSHOT.jar b/lib/bukkit-0.0.1-SNAPSHOT.jar
new file mode 100644
index 000000000..c769525f3
Binary files /dev/null and b/lib/bukkit-0.0.1-SNAPSHOT.jar differ
diff --git a/lib/craftbukkit-0.0.1-SNAPSHOT.jar b/lib/craftbukkit-0.0.1-SNAPSHOT.jar
index 4da86aef0..efbda1571 100644
Binary files a/lib/craftbukkit-0.0.1-SNAPSHOT.jar and b/lib/craftbukkit-0.0.1-SNAPSHOT.jar differ