summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-02-23 15:05:39 +0100
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-02-23 15:05:39 +0100
commit3c671b9c23e1b78c0633f5375cb13079295d059f (patch)
tree49831950eba38a8457775925ee08aab4b1e6c998 /src
parentMerge pull request #2897 from cuberite/FlushLuaSsl (diff)
parentFixed removing entities from parent chunks (diff)
downloadcuberite-3c671b9c23e1b78c0633f5375cb13079295d059f.tar
cuberite-3c671b9c23e1b78c0633f5375cb13079295d059f.tar.gz
cuberite-3c671b9c23e1b78c0633f5375cb13079295d059f.tar.bz2
cuberite-3c671b9c23e1b78c0633f5375cb13079295d059f.tar.lz
cuberite-3c671b9c23e1b78c0633f5375cb13079295d059f.tar.xz
cuberite-3c671b9c23e1b78c0633f5375cb13079295d059f.tar.zst
cuberite-3c671b9c23e1b78c0633f5375cb13079295d059f.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkMap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 935f03c10..660d4a9ea 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1685,7 +1685,7 @@ bool cChunkMap::HasEntity(UInt32 a_UniqueID)
void cChunkMap::RemoveEntity(cEntity * a_Entity)
{
cCSLock Lock(m_CSLayers);
- cChunkPtr Chunk = GetChunkNoGen(a_Entity->GetChunkX(), a_Entity->GetChunkZ());
+ cChunkPtr Chunk = a_Entity->GetParentChunk();
// Even if a chunk is not valid, it may still contain entities such as players; make sure to remove them (#1190)
if (Chunk == nullptr)