summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
authorEvilSeph <evilseph@unaligned.org>2011-06-17 08:59:03 -0400
committerEvilSeph <evilseph@unaligned.org>2011-06-17 08:59:03 -0400
commit105cc5393cabb6db1db7270af01313327cfc4f99 (patch)
treecd2556aadaba19e0f45c8a5939f93778422944b5 /src/main/java/net/minecraft/server
parent39332e5c8747d1615a8d8efa9a7062f53e1dfe1d (diff)
downloadcraftbukkit-105cc5393cabb6db1db7270af01313327cfc4f99.tar
craftbukkit-105cc5393cabb6db1db7270af01313327cfc4f99.tar.gz
craftbukkit-105cc5393cabb6db1db7270af01313327cfc4f99.tar.lz
craftbukkit-105cc5393cabb6db1db7270af01313327cfc4f99.tar.xz
craftbukkit-105cc5393cabb6db1db7270af01313327cfc4f99.zip
Forgot to account for code shuffling with player.dat fixes.
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/Entity.java8
1 files changed, 4 insertions, 4 deletions
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
}