From 8007b16d646b7ea7156fc1b3dbce1147fb03d674 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 1 Oct 2013 23:55:33 +0200 Subject: [PATCH] * Exhume - Fixed that player has to and could select creature in Exhume controllers graveyard. Now he can only select a creature in his own graveyard and only if one exists there. --- Mage.Sets/src/mage/sets/urzassaga/Exhume.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/urzassaga/Exhume.java b/Mage.Sets/src/mage/sets/urzassaga/Exhume.java index e420c74f042..5655884ab35 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/Exhume.java +++ b/Mage.Sets/src/mage/sets/urzassaga/Exhume.java @@ -28,18 +28,19 @@ package mage.sets.urzassaga; import java.util.UUID; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.Zone; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import mage.filter.predicate.other.OwnerIdPredicate; import mage.game.Game; import mage.players.Player; -import mage.target.common.TargetCardInYourGraveyard; +import mage.target.common.TargetCardInGraveyard; /** * @@ -94,9 +95,11 @@ class ExhumeEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { FilterCreatureCard filterCreatureCard = new FilterCreatureCard("creature card from your graveyard"); - TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filterCreatureCard); + filterCreatureCard.add(new OwnerIdPredicate(playerId)); + TargetCardInGraveyard target = new TargetCardInGraveyard(filterCreatureCard); target.setRequired(true); - if (player.chooseTarget(outcome, target, source, game)) { + if (target.canChoose(playerId, game) && + player.chooseTarget(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), player.getId());