From 6be2b907c7cef43afb0c7191e8121cd365386627 Mon Sep 17 00:00:00 2001 From: cbt33 Date: Tue, 15 Oct 2013 21:29:18 -0400 Subject: [PATCH] Update Tombfire.java --- Mage.Sets/src/mage/sets/odyssey/Tombfire.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/odyssey/Tombfire.java b/Mage.Sets/src/mage/sets/odyssey/Tombfire.java index 4d41945836..9b04ad5990 100644 --- a/Mage.Sets/src/mage/sets/odyssey/Tombfire.java +++ b/Mage.Sets/src/mage/sets/odyssey/Tombfire.java @@ -72,13 +72,13 @@ public class Tombfire extends CardImpl { class TombfireEffect extends OneShotEffect { - private static final FilterCard filter = new FilterCard("flashback"); +private static final FilterCard filter = new FilterCard("flashback"); static{ filter.add(new AbilityPredicate(FlashbackAbility.class)); } - public TombfireEffect() { + public TombfireEffect() { super(Outcome.Exile); staticText = "Target player exiles all cards with flashback from his or her graveyard."; } @@ -89,11 +89,15 @@ class TombfireEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player targetPlayer = game.getPlayer(source.getFirstTarget()); - for (Card card: targetPlayer.getGraveyard().getCards(filter, game)) { - card.moveToExile(null, "", source.getId(), game); - } - return false; + Player targetPlayer = game.getPlayer(targetPointer.getFirst(game, source)); + if (targetPlayer != null) { + for (Card card: targetPlayer.getGraveyard().getCards(filter, game)) { + card.moveToExile(null, "", source.getSourceId(), game); + } + return true; + } else { + return false; + } } @Override