From 105cc5393cabb6db1db7270af01313327cfc4f99 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Fri, 17 Jun 2011 08:59:03 -0400 Subject: Forgot to account for code shuffling with player.dat fixes. --- src/main/java/net/minecraft/server/Entity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/net/minecraft') diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 0937d2eb..790d6c34 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -980,18 +980,18 @@ public abstract class Entity { // CraftBukkit end // CraftBukkit Start - reset world - org.bukkit.World world = null; + CraftWorld world = null; if (this instanceof EntityPlayer) { EntityPlayer entityPlayer = (EntityPlayer) this; String worldName = nbttagcompound.getString("World"); if (worldName == "") { - world = (org.bukkit.World) ((CraftServer) Bukkit.getServer()).getServer().a(entityPlayer.dimension); + world = ((CraftServer) Bukkit.getServer()).getServer().a(entityPlayer.dimension).getWorld(); } else { - world = Bukkit.getServer().getWorld(worldName); + world = (CraftWorld) Bukkit.getServer().getWorld(worldName); } } - a(world == null ? null : ((CraftWorld) world).getHandle()); + a(world == null ? null : world.getHandle()); // CraftBukkit End } -- cgit v1.2.3