From 957d420e8d745bbc8cee33c9534d8101e031b8b0 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 24 Sep 2013 00:09:14 +0200 Subject: [PATCH] * Disciple of Phenax - It shows no longer an empty window, if target player has no cards in hand. --- .../mage/sets/theros/DiscipleOfPhenax.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java b/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java index 50c131bb9b..7411043ed2 100644 --- a/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java +++ b/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java @@ -122,22 +122,25 @@ class DiscipleOfPhenaxEffect extends OneShotEffect { } } } - - targetPlayer.revealCards("Disciple of Phenax", revealedCards, game); - - Player you = game.getPlayer(source.getControllerId()); - - if (you != null) { - TargetCard yourChoice = new TargetCard(Zone.PICK, new FilterCard()); - yourChoice.setRequired(true); - yourChoice.setNotTarget(true); - if (you.choose(Outcome.Benefit, revealedCards, yourChoice, game)) { - Card card = targetPlayer.getHand().get(yourChoice.getFirstTarget(), game); - if (card != null) { - return targetPlayer.discard(card, source, game); + if (!revealedCards.isEmpty()) { + targetPlayer.revealCards("Disciple of Phenax", revealedCards, game); + Player you = game.getPlayer(source.getControllerId()); + if (you != null) { + TargetCard yourChoice = new TargetCard(Zone.PICK, new FilterCard()); + yourChoice.setRequired(true); + yourChoice.setNotTarget(true); + if (you.choose(Outcome.Benefit, revealedCards, yourChoice, game)) { + Card card = targetPlayer.getHand().get(yourChoice.getFirstTarget(), game); + if (card != null) { + return targetPlayer.discard(card, source, game); + } } + } else { + return false; } } + return true; + } return false;