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

Fixed a crash when chunks were loaded / generated with entities ( http://forum.mc-server.org/showthread.php?tid=450 )

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@521 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-05-30 13:11:58 +00:00
parent 2372419d0c
commit bb44d25d60
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/cChunk.cpp
View File

@ -259,36 +259,14 @@ void cChunk::SetAllData(
CalculateHeightmap(); CalculateHeightmap();
} }
// Clear the internal entities: // Append entities to current entity list:
for (cEntityList::iterator itr = m_Entities.begin(); itr != m_Entities.end(); ++itr) m_Entities.splice(m_Entities.end(), a_Entities);
{
if ((*itr)->GetEntityType() == cEntity::eEntityType_Player)
{
// Move players into the new entity list
a_Entities.push_back(*itr);
}
else
{
// Delete other entities (there should not be any, since we're now loading / generating the chunk)
LOGWARNING("cChunk: There is an unexpected entity #%d of type %s in chunk [%d, %d]; it will be deleted",
(*itr)->GetUniqueID(), (*itr)->GetClass(),
m_PosX, m_PosZ
);
// MD 2012_03_10: This may happen if a mob is generated near the edge of loaded chunks and walks off of the edge. // Clear the block entities present - either the loader / saver has better, or we'll create empty ones:
// Older: Assert because this is a very curious case. These lines were executed once before, when a player died, re spawned, and walked around a bit. It's uncertain why an entity would be in the chunk in this case.
// ASSERT(!"Unexpected entity in chunk!");
(*itr)->Destroy();
}
}
for (cBlockEntityList::iterator itr = m_BlockEntities.begin(); itr != m_BlockEntities.end(); ++itr) for (cBlockEntityList::iterator itr = m_BlockEntities.begin(); itr != m_BlockEntities.end(); ++itr)
{ {
delete *itr; delete *itr;
} }
// Swap the entity lists:
std::swap(a_Entities, m_Entities);
std::swap(a_BlockEntities, m_BlockEntities); std::swap(a_BlockEntities, m_BlockEntities);
// Create block entities that the loader didn't load; fill them with defaults // Create block entities that the loader didn't load; fill them with defaults