From 8140893f0d71e2d05df8545a74f0b2bad84bc232 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 8 Aug 2014 01:18:59 +0200 Subject: [PATCH] *Fixing handling return state. --- ...xileCardYouChooseTargetOpponentEffect.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Mage/src/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java b/Mage/src/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java index 5fb0a68c32f..171d2ddd3e2 100644 --- a/Mage/src/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java +++ b/Mage/src/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java @@ -63,19 +63,20 @@ public class ExileCardYouChooseTargetOpponentEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(source.getFirstTarget()); - if (player != null && !player.getHand().isEmpty()) { - player.revealCards("Exile " + filter.getMessage(), player.getHand(), game); - Player you = game.getPlayer(source.getControllerId()); - if (you != null) { - TargetCard target = new TargetCard(Zone.PICK, filter); - if (you.choose(Outcome.Benefit, player.getHand(), target, game)) { - Card card = player.getHand().get(target.getFirstTarget(), game); + Player controller = game.getPlayer(source.getControllerId()); + Player opponent = game.getPlayer(source.getFirstTarget()); + if (controller != null && opponent != null) { + if (!opponent.getHand().isEmpty()) { + opponent.revealCards("Exile " + filter.getMessage(), opponent.getHand(), game); + TargetCard target = new TargetCard(Zone.HAND, filter); + if (controller.choose(Outcome.Exile, opponent.getHand(), target, game)) { + Card card = opponent.getHand().get(target.getFirstTarget(), game); if (card != null) { - player.moveCardToExileWithInfo(card, null, null, source.getSourceId(), game, Zone.HAND); + controller.moveCardToExileWithInfo(card, null, "", source.getSourceId(), game, Zone.HAND); } } } + return true; } return false; }