flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Entities are never lost

Browse Source
This commit is contained in:
LogicParrot
2016-03-29 21:23:53 +03:00
parent 6d1d223d04
commit 630ceed2c0
3 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Chunk.cpp
View File

@@ -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;
}