X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.cpp;fp=src%2Fworld%2FWorld.cpp;h=dc078189fdc494ab98bbb8dc93aeb4c12a565809;hb=12744a2f68b3c9496076d6d7b6fb3581ff78472a;hp=97dcc0848a40a7936179ee7e4171aac8c29f1fd1;hpb=bfa8d0303d57e62fb73dad96d1b521760d475cf8;p=blank.git

diff --git a/src/world/World.cpp b/src/world/World.cpp
index 97dcc08..dc07818 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -257,6 +257,13 @@ void World::Update(int dt) {
 			Resolve(entity, col);
 		}
 	}
+	for (auto iter = entities.begin(), end = entities.end(); iter != end;) {
+		if (iter->CanRemove()) {
+			iter = entities.erase(iter);
+		} else {
+			++iter;
+		}
+	}
 	chunks.Rebase(player->ChunkCoords());
 	chunks.Update(dt);
 }