From 20c1a2e36b7fd1cc79e45a7c2ba329d0eef53cab Mon Sep 17 00:00:00 2001
From: North <robyter@gmail>
Date: Wed, 15 Aug 2012 16:19:33 +0300
Subject: [PATCH] Added lookAtCards for hand and library for Shimian Specter

---
 .../mage/sets/magic2013/ShimianSpecter.java   | 83 +++++++++----------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/magic2013/ShimianSpecter.java b/Mage.Sets/src/mage/sets/magic2013/ShimianSpecter.java
index 5298ce5cd0..2acece096a 100644
--- a/Mage.Sets/src/mage/sets/magic2013/ShimianSpecter.java
+++ b/Mage.Sets/src/mage/sets/magic2013/ShimianSpecter.java
@@ -99,52 +99,51 @@ class ShimianSpecterEffect extends OneShotEffect<ShimianSpecterEffect> {
     @Override
     public boolean apply(Game game, Ability source) {
         Player damagedPlayer = game.getPlayer(targetPointer.getFirst(game, source));
-        if (damagedPlayer != null) {
+        Player you = game.getPlayer(source.getControllerId());
+        if (damagedPlayer != null && you != null) {
             damagedPlayer.revealCards("Shimian Specter", damagedPlayer.getHand(), game);
-            Player you = game.getPlayer(source.getControllerId());
-            if (you != null) {
-                TargetCard target = new TargetCard(Constants.Zone.PICK, filter);
-                target.setRequired(true);
-                target.setNotTarget(true);
-                if (you.choose(Constants.Outcome.Benefit, damagedPlayer.getHand(), target, game)) {
-                    Card chosenCard = damagedPlayer.getHand().get(target.getFirstTarget(), game);
-                    if (chosenCard != null) {
-                        if (damagedPlayer != null) {
-                            
-                            //cards in Library
-                            Cards cardsInLibrary = new CardsImpl(Constants.Zone.LIBRARY);
-                            cardsInLibrary.addAll(damagedPlayer.getLibrary().getCards(game));
 
-                            // cards in Graveyard
-                            Cards cardsInGraveyard = new CardsImpl(Constants.Zone.GRAVEYARD);
-                            cardsInGraveyard.addAll(damagedPlayer.getGraveyard());
-                                
-                            // cards in Hand
-                            Cards cardsInHand = new CardsImpl(Constants.Zone.HAND);
-                            cardsInHand.addAll(damagedPlayer.getHand());
-                            
-                            // exile same named cards from zones
-                            for (Card checkCard : cardsInLibrary.getCards(game)) {
-                                if (checkCard.getName().equals(chosenCard.getName())) {
-                                    checkCard.moveToExile(id, "Library", id, game);
-                                }
-                            }
-                            for (Card checkCard : cardsInGraveyard.getCards(game)) {
-                                if (checkCard.getName().equals(chosenCard.getName())) {
-                                    checkCard.moveToExile(id, "Graveyard", id, game);
-                                }
-                            }
-                            for (Card checkCard : cardsInHand.getCards(game)) {
-                                if (checkCard.getName().equals(chosenCard.getName())) {
-                                    checkCard.moveToExile(id, "Hand", id, game);
-                                }
-                            }
-                            
-                            damagedPlayer.shuffleLibrary(game);
-                            
-                            return true;
+            TargetCard target = new TargetCard(Constants.Zone.PICK, filter);
+            target.setRequired(true);
+            target.setNotTarget(true);
+            if (you.choose(Constants.Outcome.Benefit, damagedPlayer.getHand(), target, game)) {
+                Card chosenCard = damagedPlayer.getHand().get(target.getFirstTarget(), game);
+                if (chosenCard != null && damagedPlayer != null) {
+
+                    //cards in Library
+                    Cards cardsInLibrary = new CardsImpl(Constants.Zone.LIBRARY);
+                    cardsInLibrary.addAll(damagedPlayer.getLibrary().getCards(game));
+                    you.lookAtCards(damagedPlayer.getName() + ": cards in library", cardsInLibrary, game);
+
+                    // cards in Graveyard
+                    Cards cardsInGraveyard = new CardsImpl(Constants.Zone.GRAVEYARD);
+                    cardsInGraveyard.addAll(damagedPlayer.getGraveyard());
+
+                    // cards in Hand
+                    Cards cardsInHand = new CardsImpl(Constants.Zone.HAND);
+                    cardsInHand.addAll(damagedPlayer.getHand());
+                    you.lookAtCards(damagedPlayer.getName() + ": cards in hand", cardsInHand, game);
+
+                    // exile same named cards from zones
+                    for (Card checkCard : cardsInLibrary.getCards(game)) {
+                        if (checkCard.getName().equals(chosenCard.getName())) {
+                            checkCard.moveToExile(id, "Library", id, game);
                         }
                     }
+                    for (Card checkCard : cardsInGraveyard.getCards(game)) {
+                        if (checkCard.getName().equals(chosenCard.getName())) {
+                            checkCard.moveToExile(id, "Graveyard", id, game);
+                        }
+                    }
+                    for (Card checkCard : cardsInHand.getCards(game)) {
+                        if (checkCard.getName().equals(chosenCard.getName())) {
+                            checkCard.moveToExile(id, "Hand", id, game);
+                        }
+                    }
+
+                    damagedPlayer.shuffleLibrary(game);
+
+                    return true;
                 }
             }
         }