diff options
| author | EvilSeph <evilseph@unaligned.org> | 2011-06-10 05:45:17 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@unaligned.org> | 2011-06-10 05:45:17 -0400 |
| commit | a98f4f89348196abdbaa2a55a2b450bbbbe257f5 (patch) | |
| tree | 7e90bc78973df4e21056651a081a1607b3b5b320 /src/main/java/net/minecraft | |
| parent | 8f4c36974ba0a844477b523e149084296751f011 (diff) | |
| download | craftbukkit-a98f4f89348196abdbaa2a55a2b450bbbbe257f5.tar craftbukkit-a98f4f89348196abdbaa2a55a2b450bbbbe257f5.tar.gz craftbukkit-a98f4f89348196abdbaa2a55a2b450bbbbe257f5.tar.lz craftbukkit-a98f4f89348196abdbaa2a55a2b450bbbbe257f5.tar.xz craftbukkit-a98f4f89348196abdbaa2a55a2b450bbbbe257f5.zip | |
Fixed not being able to login if the world saved in your player.dat no longer exists. Thanks for the help Rigby and Verrier!
Diffstat (limited to 'src/main/java/net/minecraft')
| -rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index c18d00bb..16fc9ebe 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -916,8 +916,6 @@ public abstract class Entity { } public void e(NBTTagCompound nbttagcompound) { - // CraftBukkit - reset world - a(((CraftWorld)Bukkit.getServer().getWorld(nbttagcompound.getString("World"))).getHandle()); NBTTagList nbttaglist = nbttagcompound.l("Pos"); NBTTagList nbttaglist1 = nbttagcompound.l("Motion"); NBTTagList nbttaglist2 = nbttagcompound.l("Rotation"); @@ -964,6 +962,11 @@ public abstract class Entity { } } // CraftBukkit end + + // CraftBukkit Start - reset world + org.bukkit.World world = Bukkit.getServer().getWorld(nbttagcompound.getString("World")); + a(world == null ? null : ((CraftWorld) world).getHandle()); + // CraftBukkit End } protected final String af() { |