Black Tentacles: stop redirecting damage once owner is dead (fixes #386)

dbjorge · Mar 2, 2020 · c195a7a · c195a7a
1 parent 097e36a
commit c195a7a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * Fix crash in ManifestPatch reported in workshop comment
 * Fix issue where card text was not being updated immediately after permanent damage changes (particularly, after drawing CULL) (thanks wang429)
 * Fix issue where banishing one of the two enemies in the Spear and Shield fight would prevent Unceasing Top from working (thanks wang429)
+* Black Tentacles now *immediately* stops redirecting damage once the target dies
 
 ## [v1.5.0] - 2020-02-23
 

diff --git a/src/main/java/stsjorbsmod/powers/BlackTentaclesPower.java b/src/main/java/stsjorbsmod/powers/BlackTentaclesPower.java
@@ -56,7 +56,7 @@ public int onAnyMonsterHpLoss(AbstractMonster monster, DamageInfo originalDamage
         // We accept null owner primarily for the sake of ExplosivePotion, see #299.
         boolean isDamageFromApplicableSource = originalDamageInfo != null && (originalDamageInfo.owner == null || originalDamageInfo.owner == this.source);
 
-        if (monster != owner && isDamageFromApplicableSource && originalHpLoss > 0) {
+        if (monster != owner && isDamageFromApplicableSource && originalHpLoss > 0 && !owner.isDeadOrEscaped() && !owner.halfDead) {
             this.flash();
             DamageType newDamageType = originalDamageInfo.type == DamageType.HP_LOSS ? DamageType.HP_LOSS : DamageType.THORNS;
             DamageInfo newDamageInfo = new DamageInfo(source, originalHpLoss, newDamageType);