From b59c8b663d9d3816d3b380ea29b5c438e5d339ba Mon Sep 17 00:00:00 2001 From: jeffwadsworth Date: Wed, 19 Feb 2020 17:34:20 -0600 Subject: [PATCH] - Fixed #6289 --- Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java b/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java index 9e57afad23..cd4e8e1be9 100644 --- a/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java +++ b/Mage.Sets/src/mage/cards/a/AthreosShroudVeiled.java @@ -27,6 +27,7 @@ import mage.players.Player; import mage.target.TargetPermanent; import java.util.UUID; +import mage.game.permanent.PermanentToken; /** * @author TheElk801 @@ -62,7 +63,8 @@ public final class AthreosShroudVeiled extends CardImpl { ability.addTarget(new TargetPermanent(filter)); this.addAbility(ability); - // Whenever a creature with a coin counter on it dies or is put into exile, return that card to the battlefield under your control. + // Whenever a creature with a coin counter on it dies or is put into exile, + // return that card to the battlefield under your control. this.addAbility(new AthreosShroudVeiledTriggeredAbility()); } @@ -118,8 +120,8 @@ class AthreosShroudVeiledTriggeredAbility extends TriggeredAbilityImpl { @Override public String getRule() { - return "Whenever a creature with a coin counter on it dies or is put into exile, " + - "return that card to the battlefield under your control."; + return "Whenever a creature with a coin counter on it dies or is put into exile, " + + "return that card to the battlefield under your control."; } } @@ -149,7 +151,8 @@ class AthreosShroudVeiledEffect extends OneShotEffect { return false; } Card card = game.getCard(mor.getSourceId()); - return card.getZoneChangeCounter(game) - 1 == mor.getZoneChangeCounter() + return card != null + && card.getZoneChangeCounter(game) - 1 == mor.getZoneChangeCounter() && player.moveCards(card, Zone.BATTLEFIELD, source, game); } }