summaryrefslogtreecommitdiffstats
path: root/src/Chunk.cpp
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-03-29 20:23:53 +0200
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-03-30 13:56:47 +0200
commit630ceed2c0572df2cf5c34b66b185d021200b806 (patch)
treec9c029db48142bc3d87b6ed6f245237ded472466 /src/Chunk.cpp
parentMerge pull request #3109 from LogicParrot/moveToNewWorld (diff)
downloadcuberite-630ceed2c0572df2cf5c34b66b185d021200b806.tar
cuberite-630ceed2c0572df2cf5c34b66b185d021200b806.tar.gz
cuberite-630ceed2c0572df2cf5c34b66b185d021200b806.tar.bz2
cuberite-630ceed2c0572df2cf5c34b66b185d021200b806.tar.lz
cuberite-630ceed2c0572df2cf5c34b66b185d021200b806.tar.xz
cuberite-630ceed2c0572df2cf5c34b66b185d021200b806.tar.zst
cuberite-630ceed2c0572df2cf5c34b66b185d021200b806.zip
Diffstat (limited to 'src/Chunk.cpp')
-rw-r--r--src/Chunk.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index fa479bf9a..db8966a23 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -693,10 +693,9 @@ void cChunk::MoveEntityToNewChunk(cEntity * a_Entity)
cChunk * Neighbor = GetNeighborChunk(a_Entity->GetChunkX() * cChunkDef::Width, a_Entity->GetChunkZ() * cChunkDef::Width);
if (Neighbor == nullptr)
{
- Neighbor = m_ChunkMap->GetChunkNoLoad(a_Entity->GetChunkX(), a_Entity->GetChunkZ());
- if (Neighbor == nullptr)
+ Neighbor = m_ChunkMap->GetChunk(a_Entity->GetChunkX(), a_Entity->GetChunkZ());
+ if (Neighbor == nullptr) // This will assert inside GetChunk in debug builds
{
- // TODO: What to do with this?
LOGWARNING("%s: Failed to move entity, destination chunk unreachable. Entity lost", __FUNCTION__);
return;
}