From 84daa0f8200f446ada05d88dc4c678c0d4b487cb Mon Sep 17 00:00:00 2001 From: johnm Date: Mon, 1 Jun 2020 10:29:10 +0100 Subject: [PATCH] return false when no choice made for archon ability --- Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java b/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java index fd4d1baa2af..782302bb39c 100644 --- a/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java +++ b/Mage.Sets/src/mage/cards/a/ArchonOfValorsReach.java @@ -169,6 +169,11 @@ class ArchonOfValorsReachReplacementEffect extends ContinuousRuleModifyingEffect @Override public boolean applies(GameEvent event, Ability source, Game game) { + + if ((String) game.getState().getValue(source.getSourceId().toString() + "_cardtype") == null){ + return false; + } + CardType cardType = ArchonOfValorsReachChoice.getType((String) game.getState().getValue(source.getSourceId().toString() + "_cardtype")); // spell is not on the stack yet, so we have to check the card Card card = game.getCard(event.getSourceId());