diff --git a/Mage/src/mage/abilities/TriggeredAbilities.java b/Mage/src/mage/abilities/TriggeredAbilities.java index 067e9b5282c..f51634e0735 100644 --- a/Mage/src/mage/abilities/TriggeredAbilities.java +++ b/Mage/src/mage/abilities/TriggeredAbilities.java @@ -49,7 +49,7 @@ public class TriggeredAbilities extends AbilitiesImpl { public void checkTriggers(GameEvent event, Game game) { for (TriggeredAbility ability: this) { - if (event.getType() == GameEvent.EventType.ZONE_CHANGE || ability.isInUseableZone(game)) { + if (ability.isInUseableZone(game)) { MageObject object = game.getObject(ability.getSourceId()); if (object != null && object.getAbilities().contains(ability)) { if (ability.checkTrigger(event, game)) { diff --git a/Mage/src/mage/abilities/common/DiesTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesTriggeredAbility.java index 5ea45ce7753..67829e77694 100644 --- a/Mage/src/mage/abilities/common/DiesTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/DiesTriggeredAbility.java @@ -29,8 +29,11 @@ package mage.abilities.common; import java.util.UUID; + +import mage.Constants; import mage.Constants.Zone; import mage.abilities.effects.Effect; +import mage.cards.Card; import mage.game.Game; import mage.game.events.GameEvent; @@ -54,6 +57,15 @@ public class DiesTriggeredAbility extends ZoneChangeTriggeredAbility