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

fixed CycleOrDiesTriggeredAbility not differentiating between different types of trigger events

Browse source
This commit is contained in:
Evan Kranzler 2022-03-17 18:15:36 -04:00
parent 02017b9a88
commit 4967750669
1 changed files with 4 additions and 3 deletions

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

@ -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;