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

Fix failed merge and other issues

Browse Source
This commit is contained in:
Tiger Wang
2014-07-18 20:12:27 +01:00
parent 37140ae578
commit 719551c31f
14 changed files with 28 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entities/Entity.cpp
View File

@@ -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;
}