summaryrefslogtreecommitdiffstats
path: root/source/cWorld.cpp
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2011-12-31 22:08:23 +0100
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2011-12-31 22:08:23 +0100
commit9af5ed43fd7f85c3b2813485d0a37a559589d694 (patch)
tree94e36d8b79a11e6754a338b424d05821cfaebd0f /source/cWorld.cpp
parent- Animals burn now when moving into lava or fire (diff)
downloadcuberite-9af5ed43fd7f85c3b2813485d0a37a559589d694.tar
cuberite-9af5ed43fd7f85c3b2813485d0a37a559589d694.tar.gz
cuberite-9af5ed43fd7f85c3b2813485d0a37a559589d694.tar.bz2
cuberite-9af5ed43fd7f85c3b2813485d0a37a559589d694.tar.lz
cuberite-9af5ed43fd7f85c3b2813485d0a37a559589d694.tar.xz
cuberite-9af5ed43fd7f85c3b2813485d0a37a559589d694.tar.zst
cuberite-9af5ed43fd7f85c3b2813485d0a37a559589d694.zip
Diffstat (limited to 'source/cWorld.cpp')
-rw-r--r--source/cWorld.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/cWorld.cpp b/source/cWorld.cpp
index 501f78332..0b1ee7010 100644
--- a/source/cWorld.cpp
+++ b/source/cWorld.cpp
@@ -415,8 +415,8 @@ void cWorld::Tick(float a_Dt)
{
LOG("Destroy that entity! %i", (*itr)->GetUniqueID() );
cEntity* RemoveMe = *itr;
- itr++;
- AddToRemoveEntityQueue( *RemoveMe );
+ itr = m_pState->AllEntities.erase( itr );
+ m_pState->RemoveEntityQueue.push_back( RemoveMe );
continue;
}
(*itr)->Tick(a_Dt);