Prevent ranged damage from hitting twice (#424)

* prevent ranged damage from hitting twice --------- Co-authored-by: Try <try9998@gmail.com>
Try · Mar 9, 2023 · 7559ccc · 7559ccc
1 parent 7f5ce7a
commit 7559ccc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/game/world/bullet.cpp b/game/world/bullet.cpp
@@ -115,6 +115,8 @@ void Bullet::onMove() {
   }
 
 void Bullet::onCollide(phoenix::material_group matId) {
+  if(isFinished())
+    return;
   if(matId != phoenix::material_group::none) {
     if(material < ItemMaterial::MAT_COUNT) {
       auto s = wrld->addLandHitEffect(ItemMaterial(material),matId,obj->matrix());
@@ -130,7 +132,7 @@ void Bullet::onCollide(phoenix::material_group matId) {
   }
 
 void Bullet::onCollide(Npc& npc) {
-  if(&npc==origin())
+  if(&npc==origin() || isFinished())
     return;
 
   if(ow!=nullptr) {