Use WorldThingDamaged instead of WorldThingDied to detect boss kills

ToxicFrog · Jul 18, 2023 · 65898b0 · 65898b0
1 parent 36d3f12
commit 65898b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/indestructable/CHANGELOG.md b/indestructable/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Fix:
   - "max lives per boss kill" did not function correctly when set to 0/unlimited
+  - boss kills were not reliably detected
 
 # 0.2.7
 

diff --git a/indestructable/ca.ancilla.indestructable/Indestructable.zs b/indestructable/ca.ancilla.indestructable/Indestructable.zs
@@ -68,11 +68,11 @@ class ::IndestructableEventHandler : StaticEventHandler {
     }
   }
 
-  override void WorldThingDied(WorldEvent evt) {
-    if (!evt.thing.bBOSS || !evt.inflictor) return;
+  override void WorldThingDamaged(WorldEvent evt) {
+    if (!evt.thing || !evt.damagesource || !evt.thing.bBOSS || evt.thing.health > 0) return;
     let lives = GetInt("indestructable_lives_per_boss");
     if (!lives) return;
-    let pawn = PlayerPawn(evt.inflictor.target);
+    let pawn = PlayerPawn(evt.damagesource);
     if (!pawn) return;
     let force = ::IndestructableForce(pawn.FindInventory("::IndestructableForce"));
     if (!force) return; // PANIC