summaryrefslogtreecommitdiffstats
path: root/src/Chunk.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-12 16:21:07 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-06-12 16:21:07 +0200
commit29567c56107c86b70da130f995564beb2eaf424c (patch)
treebe7b996042b28d8ebac0c7c665963d1d7e991600 /src/Chunk.h
parentMerge branch 'master' into portals (diff)
downloadcuberite-29567c56107c86b70da130f995564beb2eaf424c.tar
cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.gz
cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.bz2
cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.lz
cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.xz
cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.zst
cuberite-29567c56107c86b70da130f995564beb2eaf424c.zip
Diffstat (limited to '')
-rw-r--r--src/Chunk.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Chunk.h b/src/Chunk.h
index 8123ac062..3046b2efe 100644
--- a/src/Chunk.h
+++ b/src/Chunk.h
@@ -425,7 +425,7 @@ private:
// A critical section is not needed, because all chunk access is protected by its parent ChunkMap's csLayers
cClientHandleList m_LoadedByClient;
cEntityList m_Entities;
- std::vector<int> m_EntitiesToRemove;
+ std::pair<bool, cEntityList::iterator *> m_EntityTickIteratorData;
cBlockEntityList m_BlockEntities;
/** Number of times the chunk has been requested to stay (by various cChunkStay objects); if zero, the chunk can be unloaded */