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

Merge pull request #3035 from marvinkopf/hotfix-parentchunk

Browse Source 
Hotfix: Add check if entity is in chunk before changing tick status
This commit is contained in:
Tiger Wang 2016-02-21 00:32:38 +00:00
commit 4909e271fa
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/World.cpp
View File

@ -1019,7 +1019,10 @@ void cWorld::Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_La
(*itr)->SetWorld(this);
m_ChunkMap->AddEntity(*itr);
ASSERT(!(*itr)->IsTicking());
(*itr)->SetIsTicking(true);
if (m_ChunkMap->HasEntity((*itr)->GetUniqueID()))
{
(*itr)->SetIsTicking(true);
}
}
m_EntitiesToAdd.clear();
}
@ -3805,7 +3808,10 @@ void cWorld::AddQueuedPlayers(void)
// Add to chunkmap, if not already there (Spawn vs MoveToWorld):
m_ChunkMap->AddEntityIfNotPresent(*itr);
ASSERT(!(*itr)->IsTicking());
(*itr)->SetIsTicking(true);
if (m_ChunkMap->HasEntity((*itr)->GetUniqueID()))
{
(*itr)->SetIsTicking(true);
}
} // for itr - PlayersToAdd[]
} // Lock(m_CSPlayers)