Entities now bail out of ticks if destroyed (#3363)

2016-09-03 14:31:27 +03:00
parent 5625598afa
commit 90be4e7efd
22 changed files with 111 additions and 1 deletions
--- a/src/Entities/ArrowEntity.cpp
+++ b/src/Entities/ArrowEntity.cpp
@@ -180,6 +180,11 @@ void cArrowEntity::CollectedBy(cPlayer & a_Dest)
 void cArrowEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
 {
 	super::Tick(a_Dt, a_Chunk);
+	if (!IsTicking())
+	{
+		// The base class tick destroyed us
+		return;
+	}
 	m_Timer += a_Dt;

 	if (m_bIsCollected)