summaryrefslogtreecommitdiffstats
path: root/src/Chunk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Chunk.cpp')
-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: