diff options
Diffstat (limited to 'src/ChunkMap.cpp')
| -rw-r--r-- | src/ChunkMap.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp index de2016015..9f280f1c5 100644 --- a/src/ChunkMap.cpp +++ b/src/ChunkMap.cpp @@ -1737,7 +1737,9 @@ void cChunkMap::RemoveEntity(cEntity * a_Entity) { cCSLock Lock(m_CSLayers); cChunkPtr Chunk = GetChunkNoGen(a_Entity->GetChunkX(), ZERO_CHUNK_Y, a_Entity->GetChunkZ()); - if ((Chunk == NULL) || !Chunk->IsValid()) + + // Even if a chunk is not valid, it may still contain entities such as players; make sure to remove them (#1190) + if (Chunk == NULL) { return; } |