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

Portal improvements and suggestions

Browse Source
This commit is contained in:
Tiger Wang
2014-06-10 20:43:27 +01:00
parent b925eb4ad4
commit 35b79e5d71
10 changed files with 179 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Chunk.cpp
View File

@@ -1859,7 +1859,20 @@ void cChunk::AddEntity(cEntity * a_Entity)
MarkDirty();
}
ASSERT(std::find(m_Entities.begin(), m_Entities.end(), a_Entity) == m_Entities.end()); // Not there already
if (std::find(m_Entities.begin(), m_Entities.end(), a_Entity) != m_Entities.end())
{
// Not there already
std::vector<int>::iterator itr = std::find(m_EntitiesToRemove.begin(), m_EntitiesToRemove.end(), a_Entity->GetUniqueID());
if (itr != m_EntitiesToRemove.end())
{
m_EntitiesToRemove.erase(itr);
return;
}
else
{
ASSERT(!"Entity already present when AddEntity was called!");
}
}
m_Entities.push_back(a_Entity);
}