Fixed cProjectileEntity double destroy bug (#3397)

2016-10-09 18:22:34 +03:00
parent 1e8cae6415
commit 4e33569110
1 changed files with 4 additions and 0 deletions
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -413,6 +413,10 @@ void cProjectileEntity::HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a
 		);

 		OnHitEntity(*(EntityCollisionCallback.GetHitEntity()), HitPos);
+		if (!IsTicking())
+		{
+			return;  // We were destroyed by an override of OnHitEntity
+		}
 	}
 	// TODO: Test the entities in the neighboring chunks, too