Skip to content

Commit c195a7a

Browse files
committed
Black Tentacles: stop redirecting damage once owner is dead (fixes #386)
1 parent 097e36a commit c195a7a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* Fix crash in ManifestPatch reported in workshop comment
1616
* Fix issue where card text was not being updated immediately after permanent damage changes (particularly, after drawing CULL) (thanks wang429)
1717
* Fix issue where banishing one of the two enemies in the Spear and Shield fight would prevent Unceasing Top from working (thanks wang429)
18+
* Black Tentacles now *immediately* stops redirecting damage once the target dies
1819

1920
## [v1.5.0] - 2020-02-23
2021

src/main/java/stsjorbsmod/powers/BlackTentaclesPower.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public int onAnyMonsterHpLoss(AbstractMonster monster, DamageInfo originalDamage
5656
// We accept null owner primarily for the sake of ExplosivePotion, see #299.
5757
boolean isDamageFromApplicableSource = originalDamageInfo != null && (originalDamageInfo.owner == null || originalDamageInfo.owner == this.source);
5858

59-
if (monster != owner && isDamageFromApplicableSource && originalHpLoss > 0) {
59+
if (monster != owner && isDamageFromApplicableSource && originalHpLoss > 0 && !owner.isDeadOrEscaped() && !owner.halfDead) {
6060
this.flash();
6161
DamageType newDamageType = originalDamageInfo.type == DamageType.HP_LOSS ? DamageType.HP_LOSS : DamageType.THORNS;
6262
DamageInfo newDamageInfo = new DamageInfo(source, originalHpLoss, newDamageType);

0 commit comments

Comments
 (0)