diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index b0b536b2bc8..74555fde0f9 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -3564,7 +3564,15 @@ public class Card extends GameEntity implements Comparable, IHasSVars, ITr return false; } for (SpellAbility sa : getSpellAbilities()) { - if (!(sa instanceof SpellPermanent && sa.isBasicSpell()) && !sa.isMorphUp() && !sa.isDisguiseUp()) { + // morph up and disguise up are not part of the card + if (sa.isMorphUp() || sa.isDisguiseUp()) { + continue; + } + // while Adventure and Omen are part of Secondary + if ((sa.isAdventure() || sa.isOmen()) && !getCurrentStateName().equals(sa.getCardState())) { + continue; + } + if (!(sa instanceof SpellPermanent && sa.isBasicSpell())) { return false; } }