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

Slight cleanup after portals

Browse Source
This commit is contained in:
Tiger Wang
2014-07-29 20:50:30 +01:00
parent 30e64ed4d8
commit 4f5d73b770
8 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/World.cpp
View File

@@ -2465,10 +2465,12 @@ void cWorld::AddPlayer(cPlayer * a_Player)
void cWorld::RemovePlayer(cPlayer * a_Player)
void cWorld::RemovePlayer(cPlayer * a_Player, bool a_RemoveFromChunk)
{
if (!a_Player->IsWorldTravellingFrom(this))
if (a_RemoveFromChunk)
{
// To prevent iterator invalidations when an entity goes through a portal and calls this function whilst being ticked by cChunk
// we should not change cChunk's entity list if asked not to
m_ChunkMap->RemoveEntity(a_Player);
}
{