summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Entities/ProjectileEntity.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index 2f90a56cb..fb7da85a1 100644
--- 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