fixed Rakdos's Return not causing discard

This commit is contained in:
Evan Kranzler 2018-04-25 09:40:57 -04:00
parent d6fcadaa75
commit 9eceb9a495

View file

@ -39,7 +39,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetOpponent;
import mage.target.targetpointer.FixedTarget;
@ -87,18 +86,12 @@ class RakdossReturnEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getFirstTarget());
if (player == null) {
Permanent permanent = game.getPermanent(source.getFirstTarget());
if (permanent != null) {
player = game.getPlayer(permanent.getControllerId());
}
}
Player player = game.getPlayerOrPlaneswalkerController(source.getFirstTarget());
if (player == null) {
return false;
}
Effect effect = new DiscardTargetEffect(new ManacostVariableValue());
effect.setTargetPointer(new FixedTarget(player.getId(), game));
return true;
return effect.apply(game, source);
}
}