diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-12 19:13:46 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-12 19:13:46 +0200 |
| commit | 1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f (patch) | |
| tree | f7cf72e49a7ca60d10af12ad9ff70910e089b028 /src/Entities/Player.cpp | |
| parent | Renamed SetWalkSpeed() to SetRelativeWalkSpeed() (diff) | |
| parent | Fixed iron ore drop. (diff) | |
| download | cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.gz cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.bz2 cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.lz cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.xz cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.tar.zst cuberite-1223a24d3c87832c08545e6f3e8e4c51ff1e7e3f.zip | |
Diffstat (limited to '')
| -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 b3bb1072e..e1f9c30ea 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -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(); |