From ea561892f57d4a5f4bc0f1bbd742a24a339de64f Mon Sep 17 00:00:00 2001 From: Jeff Wadsworth Date: Thu, 23 Sep 2021 16:45:35 -0500 Subject: [PATCH] - Fixed #8293 --- .../common/DealtDamageAndDiedTriggeredAbility.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/common/DealtDamageAndDiedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealtDamageAndDiedTriggeredAbility.java index b2a50fa6b6e..8ef3f6d6725 100644 --- a/Mage/src/main/java/mage/abilities/common/DealtDamageAndDiedTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealtDamageAndDiedTriggeredAbility.java @@ -58,13 +58,14 @@ public class DealtDamageAndDiedTriggeredAbility extends TriggeredAbilityImpl { if (filter.match(zEvent.getTarget(), game)) { boolean damageDealt = false; for (MageObjectReference mor : zEvent.getTarget().getDealtDamageByThisTurn()) { - if (mor.refersTo(getSourceObject(game), game)) { + if (mor.refersTo(game.getLastKnownInformation(getSourceId(), Zone.BATTLEFIELD), game) + || (mor.refersTo(getSourceObject(game), game))) { damageDealt = true; break; } } if (damageDealt) { - if(this.setTargetPointer == SetTargetPointer.PERMANENT) { + if (this.setTargetPointer == SetTargetPointer.PERMANENT) { for (Effect effect : getEffects()) { effect.setTargetPointer(new FixedTarget(event.getTargetId())); } @@ -78,6 +79,6 @@ public class DealtDamageAndDiedTriggeredAbility extends TriggeredAbilityImpl { @Override public String getTriggerPhrase() { - return "Whenever a " + filter.getMessage() + " dealt damage by {this} this turn dies, " ; + return "Whenever a " + filter.getMessage() + " dealt damage by {this} this turn dies, "; } }