flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into Effects

Browse Source
This commit is contained in:
Howaner
2014-09-12 19:13:46 +02:00
parent 38e824dbcf abcae75992
commit 1223a24d3c
133 changed files with 2159 additions and 1377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Player.cpp
View File

@@ -1668,7 +1668,11 @@ bool cPlayer::LoadFromFile(const AString & a_FileName, cWorldPtr & a_World)
cEnderChestEntity::LoadFromJson(root["enderchestinventory"], m_EnderChestContents);
m_LoadedWorldName = root.get("world", "world").asString();
a_World = cRoot::Get()->GetWorld(GetLoadedWorldName(), true);
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();