diff options
| author | Masy98 <masy@antheruscraft.de> | 2014-09-06 22:03:35 +0200 |
|---|---|---|
| committer | Masy98 <masy@antheruscraft.de> | 2014-09-06 22:03:35 +0200 |
| commit | 029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e (patch) | |
| tree | dd6dce68bf9f1951f6aa663ebc7b4ff3cec38172 /src/Entities | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | Merge pull request #1385 from mc-server/clangWarnings (diff) | |
| download | cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.gz cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.bz2 cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.lz cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.xz cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.tar.zst cuberite-029eb3d4fac9d480ab2f4bac4ac8fd981a378d9e.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Player.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 756410989..b0da6965a 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1670,7 +1670,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(); |