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

Added some asserts to trace a bug

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@319 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth 2012-02-22 20:33:33 +00:00
parent 6015b59f13
commit 3ca9b52ab2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/cChunk.cpp
View File

@ -247,7 +247,11 @@ void cChunk::SetAllData(const char * a_BlockData, cEntityList & a_Entities, cBlo
(*itr)->GetUniqueID(), (*itr)->GetClass(), (*itr)->GetUniqueID(), (*itr)->GetClass(),
m_PosX, m_PosZ m_PosX, m_PosZ
); );
delete *itr;
// 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)

2
source/cEntity.cpp
View File

@ -60,7 +60,7 @@ cEntity::~cEntity()
if( !m_bDestroyed || !m_bRemovedFromChunk ) if( !m_bDestroyed || !m_bRemovedFromChunk )
{ {
LOGERROR("ERROR: Entity deallocated without being destroyed %i or unlinked %i", m_bDestroyed, m_bRemovedFromChunk ); ASSERT(!"Entity deallocated without being destroyed %i or unlinked %i", m_bDestroyed, m_bRemovedFromChunk );
} }
delete m_Referencers; delete m_Referencers;
delete m_References; delete m_References;