diff options
| author | Mattes D <github@xoft.cz> | 2015-03-21 15:20:31 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-03-21 15:20:31 +0100 |
| commit | e9b8be25f96e9e62d7d8e33c701769830c5a1e45 (patch) | |
| tree | 13efe4ca661c13272dbc3d24a52911d40267974b /src/Entities | |
| parent | Fixed trailing whitespace. (diff) | |
| download | cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.gz cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.bz2 cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.lz cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.xz cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.tar.zst cuberite-e9b8be25f96e9e62d7d8e33c701769830c5a1e45.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Entity.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 1bc4690e1..039c58ee4 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -1263,7 +1263,7 @@ bool cEntity::DetectPortal() { if (GetWorld()->GetDimension() == dimOverworld) { - if (GetWorld()->GetNetherWorldName().empty() && GetWorld()->GetEndWorldName().empty()) + if (GetWorld()->GetLinkedNetherWorldName().empty() && GetWorld()->GetLinkedEndWorldName().empty()) { // Teleportation to either dimension not enabled, don't bother proceeding return false; @@ -1314,7 +1314,7 @@ bool cEntity::DetectPortal() } else { - if (GetWorld()->GetNetherWorldName().empty()) + if (GetWorld()->GetLinkedNetherWorldName().empty()) { return false; } @@ -1327,7 +1327,7 @@ bool cEntity::DetectPortal() ((cPlayer *)this)->GetClientHandle()->SendRespawn(dimNether); } - return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetNetherWorldName(), dimNether, GetWorld()->GetName()), false); + return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedNetherWorldName(), dimNether, GetWorld()->GetName()), false); } } case E_BLOCK_END_PORTAL: @@ -1358,7 +1358,7 @@ bool cEntity::DetectPortal() } else { - if (GetWorld()->GetEndWorldName().empty()) + if (GetWorld()->GetLinkedEndWorldName().empty()) { return false; } @@ -1371,7 +1371,7 @@ bool cEntity::DetectPortal() ((cPlayer *)this)->GetClientHandle()->SendRespawn(dimEnd); } - return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetEndWorldName(), dimEnd, GetWorld()->GetName()), false); + return MoveToWorld(cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedEndWorldName(), dimEnd, GetWorld()->GetName()), false); } } |