diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 790d6c3450..cf5bca417b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -989,6 +989,8 @@ public abstract class Entity {
             } else {
                 world = (CraftWorld) Bukkit.getServer().getWorld(worldName);
             }
+        } else {
+            world = (CraftWorld) Bukkit.getServer().getWorld(nbttagcompound.getString("World"));
         }
 
         a(world == null ? null : world.getHandle());