github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-07 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed

Browse source
This commit is contained in:
Jeff Wadsworth 2021-09-23 16:45:35 -05:00
parent 71bebad14a
commit ea561892f5
1 changed files with 4 additions and 3 deletions

7
Mage/src/main/java/mage/abilities/common/DealtDamageAndDiedTriggeredAbility.java
View file

@ -58,13 +58,14 @@ public class DealtDamageAndDiedTriggeredAbility extends TriggeredAbilityImpl {
if (filter.match(zEvent.getTarget(), game)) { if (filter.match(zEvent.getTarget(), game)) {
boolean damageDealt = false; boolean damageDealt = false;
for (MageObjectReference mor : zEvent.getTarget().getDealtDamageByThisTurn()) { 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; damageDealt = true;
break; break;
} }
} }
if (damageDealt) { if (damageDealt) {
if(this.setTargetPointer == SetTargetPointer.PERMANENT) { if (this.setTargetPointer == SetTargetPointer.PERMANENT) {
for (Effect effect : getEffects()) { for (Effect effect : getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getTargetId())); effect.setTargetPointer(new FixedTarget(event.getTargetId()));
} }
@ -78,6 +79,6 @@ public class DealtDamageAndDiedTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public String getTriggerPhrase() { 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, ";
} }
} }