Fixed uuid code that was prematurely pushed.

1 files changed, 17 insertions, 15 deletions

diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b94d3f1f..1c8a031e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -980,24 +980,26 @@ public abstract class Entity {
         // CraftBukkit end
 
         // CraftBukkit start - reset world
-        org.bukkit.Server server = Bukkit.getServer();
-        org.bukkit.World bworld = null;
+        if (this instanceof EntityPlayer) {
+            org.bukkit.Server server = Bukkit.getServer();
+            org.bukkit.World bworld = null;
 
-        // TODO: Remove World related checks, replaced with WorldUID.
-        String worldName = nbttagcompound.getString("World");
+            // TODO: Remove World related checks, replaced with WorldUID.
+            String worldName = nbttagcompound.getString("World");
 
-        if (nbttagcompound.hasKey("WorldUUIDMost") && nbttagcompound.hasKey("WorldUUIDLeast")) {
-            UUID uid = new UUID(nbttagcompound.getLong("WorldUUIDMost"), nbttagcompound.getLong("WorldUUIDLeast"));
-            bworld = server.getWorld(uid);
-        } else {
-            bworld = server.getWorld(worldName);
-        }
-        if(bworld == null && this instanceof EntityPlayer) {
-            EntityPlayer entityPlayer = (EntityPlayer) this;
-            bworld = ((org.bukkit.craftbukkit.CraftServer) server).getServer().getWorldServer(entityPlayer.dimension).getWorld();
-        }
+            if (nbttagcompound.hasKey("WorldUUIDMost") && nbttagcompound.hasKey("WorldUUIDLeast")) {
+                UUID uid = new UUID(nbttagcompound.getLong("WorldUUIDMost"), nbttagcompound.getLong("WorldUUIDLeast"));
+                bworld = server.getWorld(uid);
+            } else {
+                bworld = server.getWorld(worldName);
+            }
+            if (bworld == null) {
+                EntityPlayer entityPlayer = (EntityPlayer) this;
+                bworld = ((org.bukkit.craftbukkit.CraftServer) server).getServer().getWorldServer(entityPlayer.dimension).getWorld();
+            }
 
-        this.spawnIn(bworld == null ? null : ((org.bukkit.craftbukkit.CraftWorld) bworld).getHandle());
+            this.spawnIn(bworld == null ? null : ((org.bukkit.craftbukkit.CraftWorld) bworld).getHandle());
+        }
         // CraftBukkit end
     }