1 files changed, 32 insertions, 37 deletions

diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 6fb615f1c..2f3bdff81 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -586,36 +586,37 @@ void cChunk::Tick(float a_Dt)
 	// Tick all entities in this chunk (except mobs):
 	for (cEntityList::iterator itr = m_Entities.begin(); itr != m_Entities.end(); ++itr)
 	{
-		// Mobs are tickes inside MobTick (as we don't have to tick them if they are far away from players)
+		// Mobs are ticked inside cWorld::TickMobs() (as we don't have to tick them if they are far away from players)
+		// Don't tick things queued to be removed
 		if (!((*itr)->IsMob()))
 		{
 			(*itr)->Tick(a_Dt, *this);
+			continue;
 		}
 	}  // for itr - m_Entitites[]
 	
-	// Remove all entities that were scheduled for removal:
-	for (cEntityList::iterator itr = m_Entities.begin(); itr != m_Entities.end();)
-	{
-			if ((*itr)->IsDestroyed())
-			{
-				LOGD("Destroying entity #%i (%s)", (*itr)->GetUniqueID(), (*itr)->GetClass());
-				cEntity * ToDelete = *itr;
-				itr = m_Entities.erase(itr);
-				delete ToDelete;
-				ToDelete = NULL;
-				continue;
-			}
-			++itr;
-	}  // for itr - m_Entitites[]
-	
-	// If any entity moved out of the chunk, move it to the neighbor:
 	for (cEntityList::iterator itr = m_Entities.begin(); itr != m_Entities.end();)
 	{
-		if (
+		if ((*itr)->IsDestroyed()) // Remove all entities that were scheduled for removal:
+		{
+			LOGD("Destroying entity #%i (%s)", (*itr)->GetUniqueID(), (*itr)->GetClass());
+			MarkDirty();
+			cEntity * ToDelete = *itr;
+			itr = m_Entities.erase(itr);
+			delete ToDelete;
+		}
+		else if ((*itr)->IsTravellingThroughPortal()) // Remove all entities that are travelling to another world
+		{
+			MarkDirty();
+			(*itr)->SetIsTravellingThroughPortal(false);
+			itr = m_Entities.erase(itr);
+		}
+		else if ( // If any entity moved out of the chunk, move it to the neighbor:
 			((*itr)->GetChunkX() != m_PosX) ||
 			((*itr)->GetChunkZ() != m_PosZ)
 		)
 		{
+			MarkDirty();
 			MoveEntityToNewChunk(*itr);
 			itr = m_Entities.erase(itr);
 		}
@@ -623,7 +624,7 @@ void cChunk::Tick(float a_Dt)
 		{
 			++itr;
 		}
-	}
+	}  // for itr - m_Entitites[]
 	
 	ApplyWeatherToTop();
 }
@@ -908,7 +909,6 @@ void cChunk::ApplyWeatherToTop()
 			}
 			break;
 		}  // case (snowy biomes)
-		// TODO: Rainy biomes should check for farmland and cauldrons
 		default:
 		{
 			break;
@@ -1803,7 +1803,7 @@ void cChunk::RemoveBlockEntity( cBlockEntity* a_BlockEntity )
 
 
 
-bool cChunk::AddClient(cClientHandle* a_Client)
+bool cChunk::AddClient(cClientHandle * a_Client)
 {
 	for (cClientHandleList::iterator itr = m_LoadedByClient.begin(); itr != m_LoadedByClient.end(); ++itr)
 	{
@@ -1834,7 +1834,7 @@ bool cChunk::AddClient(cClientHandle* a_Client)
 
 
 
-void cChunk::RemoveClient( cClientHandle* a_Client )
+void cChunk::RemoveClient(cClientHandle * a_Client)
 {
 	for (cClientHandleList::iterator itr = m_LoadedByClient.begin(); itr != m_LoadedByClient.end(); ++itr)
 	{
@@ -1842,12 +1842,12 @@ void cChunk::RemoveClient( cClientHandle* a_Client )
 		{
 			continue;
 		}
-		
+
 		m_LoadedByClient.erase(itr);
 
 		if (!a_Client->IsDestroyed())
 		{
-			for (cEntityList::iterator itr = m_Entities.begin(); itr != m_Entities.end(); ++itr )
+			for (cEntityList::iterator itr = m_Entities.begin(); itr != m_Entities.end(); ++itr)
 			{
 				/*
 				// DEBUG:
@@ -1867,7 +1867,7 @@ void cChunk::RemoveClient( cClientHandle* a_Client )
 
 
 
-bool cChunk::HasClient( cClientHandle* a_Client )
+bool cChunk::HasClient(cClientHandle* a_Client)
 {
 	for (cClientHandleList::const_iterator itr = m_LoadedByClient.begin(); itr != m_LoadedByClient.end(); ++itr)
 	{
@@ -1898,9 +1898,9 @@ void cChunk::AddEntity(cEntity * a_Entity)
 	{
 		MarkDirty();
 	}
-	
-	ASSERT(std::find(m_Entities.begin(), m_Entities.end(), a_Entity) == m_Entities.end());  // Not there already
-	
+
+	ASSERT(std::find(m_Entities.begin(), m_Entities.end(), a_Entity) == m_Entities.end());
+
 	m_Entities.push_back(a_Entity);
 }
 
@@ -1910,17 +1910,12 @@ void cChunk::AddEntity(cEntity * a_Entity)
 
 void cChunk::RemoveEntity(cEntity * a_Entity)
 {
-	size_t SizeBefore = m_Entities.size();
 	m_Entities.remove(a_Entity);
-	size_t SizeAfter = m_Entities.size();
-	
-	if (SizeBefore != SizeAfter)
+
+	// Mark as dirty if it was a server-generated entity:
+	if (!a_Entity->IsPlayer())
 	{
-		// Mark as dirty if it was a server-generated entity:
-		if (!a_Entity->IsPlayer())
-		{
-			MarkDirty();
-		}
+		MarkDirty();
 	}
 }