diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-18 21:12:27 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-18 21:12:27 +0200 |
| commit | 719551c31f5ed0d3cbad9797dd81a6bf1ae4e5a2 (patch) | |
| tree | c95660d4c5e94fa7b63cf74c2f6b948a41ea0a29 /src/Entities/Entity.cpp | |
| parent | Merge branch 'master' into portals (diff) | |
| download | cuberite-719551c31f5ed0d3cbad9797dd81a6bf1ae4e5a2.tar cuberite-719551c31f5ed0d3cbad9797dd81a6bf1ae4e5a2.tar.gz cuberite-719551c31f5ed0d3cbad9797dd81a6bf1ae4e5a2.tar.bz2 cuberite-719551c31f5ed0d3cbad9797dd81a6bf1ae4e5a2.tar.lz cuberite-719551c31f5ed0d3cbad9797dd81a6bf1ae4e5a2.tar.xz cuberite-719551c31f5ed0d3cbad9797dd81a6bf1ae4e5a2.tar.zst cuberite-719551c31f5ed0d3cbad9797dd81a6bf1ae4e5a2.zip | |
Diffstat (limited to 'src/Entities/Entity.cpp')
| -rw-r--r-- | src/Entities/Entity.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index e5e4cf4cb..bd1839580 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -1028,7 +1028,7 @@ void cEntity::DetectCacti(void) void cEntity::DetectPortal() { - if (!GetWorld()->AreNetherPortalsEnabled() && !GetWorld()->AreEndPortalsEnabled()) + if (!GetWorld()->GetNetherWorldName().empty() && !GetWorld()->GetEndWorldName().empty()) { return; } @@ -1040,7 +1040,7 @@ void cEntity::DetectPortal() { case E_BLOCK_NETHER_PORTAL: { - if (!GetWorld()->AreNetherPortalsEnabled() || m_PortalCooldownData.second) + if (GetWorld()->GetNetherWorldName().empty() || m_PortalCooldownData.second) { return; } @@ -1085,7 +1085,7 @@ void cEntity::DetectPortal() } case E_BLOCK_END_PORTAL: { - if (!GetWorld()->AreEndPortalsEnabled() || m_PortalCooldownData.second) + if (GetWorld()->GetNetherWorldName().empty() || m_PortalCooldownData.second) { return; } |