Attempt at fixing crashes with disconnecting players

git-svn-id: http://mc-server.googlecode.com/svn/trunk@329 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-02-26 12:55:42 +00:00
parent 0e33c919dd
commit 7268a70902
6 changed files with 38 additions and 18 deletions
--- a/source/cEntity.cpp
+++ b/source/cEntity.cpp
@@ -169,14 +169,18 @@ void cEntity::MoveToCorrectChunk(bool a_bIgnoreOldChunk)

 void cEntity::Destroy()
 {
-	if( !m_bDestroyed )
+	if (m_bDestroyed)
 	{
-		m_bDestroyed = true;
-		if( !m_bRemovedFromChunk )
-		{
-			RemoveFromChunk();
-		}
+		return;
 	}
+	if (!m_bRemovedFromChunk)
+	{
+		RemoveFromChunk();
+	}
+	
+	m_World->BroadcastToChunk(m_ChunkX, m_ChunkY, m_ChunkZ, cPacket_DestroyEntity(this));
+	
+	m_bDestroyed = true;
 }