From 4967750669f1d6198974c1ad0a95900d3effd30c Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 17 Mar 2022 18:15:36 -0400 Subject: [PATCH] fixed CycleOrDiesTriggeredAbility not differentiating between different types of trigger events --- .../mage/abilities/common/CycleOrDiesTriggeredAbility.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/common/CycleOrDiesTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/CycleOrDiesTriggeredAbility.java index b81b5160610..659b11978ee 100644 --- a/Mage/src/main/java/mage/abilities/common/CycleOrDiesTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/CycleOrDiesTriggeredAbility.java @@ -23,7 +23,8 @@ public class CycleOrDiesTriggeredAbility extends ZoneChangeTriggeredAbility { @Override public boolean checkEventType(GameEvent event, Game game) { - return event.getType() == GameEvent.EventType.ACTIVATED_ABILITY; + return event.getType() == GameEvent.EventType.ZONE_CHANGE + || event.getType() == GameEvent.EventType.ACTIVATED_ABILITY; } @Override @@ -31,8 +32,8 @@ public class CycleOrDiesTriggeredAbility extends ZoneChangeTriggeredAbility { if (!event.getSourceId().equals(this.getSourceId())) { return false; } - if (((ZoneChangeEvent) event).isDiesEvent()) { - return true; + if (event.getType() == GameEvent.EventType.ZONE_CHANGE) { + return ((ZoneChangeEvent) event).isDiesEvent(); } StackObject object = game.getStack().getStackObject(event.getSourceId()); return object != null && object.getStackAbility() instanceof CyclingAbility;