summaryrefslogtreecommitdiffstats
path: root/src/Chunk.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-20 11:46:45 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-20 11:46:45 +0200
commit6ab9afd0fd808fad99cd8387c72ce461c37aef80 (patch)
treec7fdd4f7cdc75b4958c297e55e2801510654ee76 /src/Chunk.cpp
parentFix failed merge and other issues (diff)
downloadcuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.gz
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.bz2
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.lz
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.xz
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.zst
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.zip
Diffstat (limited to '')
-rw-r--r--src/Chunk.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 2f3bdff81..4588de9f3 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -591,7 +591,6 @@ void cChunk::Tick(float a_Dt)
if (!((*itr)->IsMob()))
{
(*itr)->Tick(a_Dt, *this);
- continue;
}
} // for itr - m_Entitites[]
@@ -605,10 +604,10 @@ void cChunk::Tick(float a_Dt)
itr = m_Entities.erase(itr);
delete ToDelete;
}
- else if ((*itr)->IsTravellingThroughPortal()) // Remove all entities that are travelling to another world
+ else if ((*itr)->IsWorldTravellingFrom(m_World)) // Remove all entities that are travelling to another world
{
MarkDirty();
- (*itr)->SetIsTravellingThroughPortal(false);
+ (*itr)->SetWorldTravellingFrom(NULL);
itr = m_Entities.erase(itr);
}
else if ( // If any entity moved out of the chunk, move it to the neighbor: