Fixed player spawning in unknown world.

This may happen if the admin removes a world.
cuberite · Sep 6, 2014 · 9e1f67932b32241312f25279d924c235d4cff66d · 9e1f679
1 parent 29910bc
commit 9e1f67932b32241312f25279d924c235d4cff66d
Unified Split

Showing with 4 additions and 0 deletions.

+4 −0 src/Entities/Player.cpp
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
@@ -1671,6 +1671,10 @@ bool cPlayer::LoadFromFile(const AString & a_FileName, cWorldPtr & a_World)

 	m_LoadedWorldName = root.get("world", "world").asString();
 	a_World = cRoot::Get()->GetWorld(GetLoadedWorldName(), false);
+	if (a_World == NULL)
+	{
+		a_World = cRoot::Get()->GetDefaultWorld();
+	}

 	m_LastBedPos.x = root.get("SpawnX", a_World->GetSpawnX()).asInt();
 	m_LastBedPos.y = root.get("SpawnY", a_World->GetSpawnY()).asInt();