From fd5a94316438d11f29d64f2cbedaa8227f4eb584 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 18 Jan 2014 18:01:22 +0100
Subject: [PATCH] * Disciple of Phenax - If cards in hand are fewer than
 devotion all cards in hand are revealed automatically.

---
 .../mage/sets/theros/DiscipleOfPhenax.java    | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java b/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java
index 450cecee79d..ea2aaae482a 100644
--- a/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java
+++ b/Mage.Sets/src/mage/sets/theros/DiscipleOfPhenax.java
@@ -107,20 +107,24 @@ class DiscipleOfPhenaxEffect extends OneShotEffect<DiscipleOfPhenaxEffect> {
         if (devotion > 0 && targetPlayer != null) {
             Cards revealedCards = new CardsImpl(Zone.PICK);
             int amount = Math.min(targetPlayer.getHand().size(), devotion);
-            FilterCard filter = new FilterCard("card in target player's hand");
-            TargetCardInHand chosenCards = new TargetCardInHand(amount, amount, filter);
-            chosenCards.setRequired(true);
-            chosenCards.setNotTarget(true);
-            if (chosenCards.canChoose(targetPlayer.getId(), game) && targetPlayer.choose(Outcome.Discard, targetPlayer.getHand(), chosenCards, game)) {
-                if (!chosenCards.getTargets().isEmpty()) {
-                    List<UUID> targets = chosenCards.getTargets();
-                    for (UUID targetid : targets) {
-                        Card card = game.getCard(targetid);
-                        if (card != null) {
-                            revealedCards.add(card);
+            if (targetPlayer.getHand().size() > amount) {
+                FilterCard filter = new FilterCard("card in target player's hand");
+                TargetCardInHand chosenCards = new TargetCardInHand(amount, amount, filter);
+                chosenCards.setRequired(true);
+                chosenCards.setNotTarget(true);
+                if (chosenCards.canChoose(targetPlayer.getId(), game) && targetPlayer.choose(Outcome.Discard, targetPlayer.getHand(), chosenCards, game)) {
+                    if (!chosenCards.getTargets().isEmpty()) {
+                        List<UUID> targets = chosenCards.getTargets();
+                        for (UUID targetid : targets) {
+                            Card card = game.getCard(targetid);
+                            if (card != null) {
+                                revealedCards.add(card);
+                            }
                         }
                     }
                 }
+            } else {
+                revealedCards.addAll(targetPlayer.getHand());
             }
             if (!revealedCards.isEmpty()) {
                 targetPlayer.revealCards("Disciple of Phenax", revealedCards, game);