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

Fixed invalid iterators

Browse Source
This commit is contained in:
Tiger Wang
2014-06-21 22:07:38 +01:00
parent 1296c5dce7
commit 6e681269d9
7 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Entities/Entity.cpp
View File

@@ -57,6 +57,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
, m_Width(a_Width)
, m_Height(a_Height)
, m_InvulnerableTicks(0)
, m_IsTravellingThroughPortal(false)
{
cCSLock Lock(m_CSCount);
m_EntityCount++;
@@ -1183,7 +1184,7 @@ bool cEntity::MoveToWorld(const AString & a_WorldName, cWorld * a_World, bool a_
}
// Remove all links to the old world
GetWorld()->RemoveEntity(this);
SetIsTravellingThroughPortal(true); // cChunk handles entity removal
GetWorld()->BroadcastDestroyEntity(*this);
// Queue add to new world