1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 9d43ae5c..5b01faae 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -341,7 +341,13 @@ public abstract class EntityHuman extends EntityLiving {
             this.a(true, true, false);
         }
 
-        this.spawnWorld = nbttagcompound.getString("SpawnWorld"); // CraftBukkit
+        // CraftBukkit - Start
+        this.spawnWorld = nbttagcompound.getString("SpawnWorld");
+        if (this.spawnWorld == "") {
+            CraftServer server = ((WorldServer) world).getServer();
+            this.spawnWorld = server.getWorlds().get(0).getName();
+        }
+        // CraftBukkit - End
 
         if (nbttagcompound.hasKey("SpawnX") && nbttagcompound.hasKey("SpawnY") && nbttagcompound.hasKey("SpawnZ")) {
             this.b = new ChunkCoordinates(nbttagcompound.e("SpawnX"), nbttagcompound.e("SpawnY"), nbttagcompound.e("SpawnZ"));