From 2a7ba64316a5d7943fd1a265e85d1108de266265 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sun, 11 Sep 2011 09:10:02 +0000
Subject: [PATCH] Less is more.

---
 .../lotro/cards/set1/site/Card1_351.java      |  2 +-
 .../lotro/cards/set1/wraith/Card1_215.java    | 27 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java
index de9a52fa0..32db0d9f6 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_351.java
@@ -46,7 +46,7 @@ public class Card1_351 extends AbstractSite {
                                     new RevealAndChooseCardsFromOpponentHandEffect(playerId, opponentId, Filters.none(), 0, 0) {
                                         @Override
                                         protected void cardsSelected(List<PhysicalCard> selectedCards) {
-                                            // Do nothing, it's just to reveal
+                                            // Do nothing, it's just to look at hand
                                         }
                                     });
                         }
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_215.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_215.java
index 8d6e67774..e89f376fc 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_215.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_215.java
@@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.actions.PlayEventAction;
 import com.gempukku.lotro.cards.decisions.ForEachYouSpotDecision;
 import com.gempukku.lotro.cards.effects.DiscardCardFromDeckEffect;
 import com.gempukku.lotro.cards.effects.PutCardFromDeckIntoHandOrDiscardEffect;
+import com.gempukku.lotro.cards.effects.RevealTopCardsOfDrawDeckEffect;
 import com.gempukku.lotro.common.*;
 import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
@@ -12,7 +13,6 @@ import com.gempukku.lotro.game.state.LotroGame;
 import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException;
 import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect;
 
-import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -39,17 +39,20 @@ public class Card1_215 extends AbstractEvent {
                             @Override
                             public void decisionMade(String result) throws DecisionResultInvalidException {
                                 int spotCount = getValidatedResult(result);
-                                List<? extends PhysicalCard> deck = game.getGameState().getDeck(playerId);
-                                spotCount = Math.min(spotCount, deck.size());
-                                List<PhysicalCard> revealedCards = new LinkedList<PhysicalCard>(deck.subList(0, spotCount));
-                                for (PhysicalCard revealedCard : revealedCards) {
-                                    if (revealedCard.getBlueprint().getCulture() == Culture.WRAITH)
-                                        action.addEffect(
-                                                new PutCardFromDeckIntoHandOrDiscardEffect(revealedCard));
-                                    else
-                                        action.addEffect(
-                                                new DiscardCardFromDeckEffect(playerId, revealedCard));
-                                }
+                                action.addEffect(
+                                        new RevealTopCardsOfDrawDeckEffect(playerId, spotCount) {
+                                            @Override
+                                            protected void cardsRevealed(List<PhysicalCard> cards) {
+                                                for (PhysicalCard revealedCard : cards) {
+                                                    if (revealedCard.getBlueprint().getCulture() == Culture.WRAITH)
+                                                        action.addEffect(
+                                                                new PutCardFromDeckIntoHandOrDiscardEffect(revealedCard));
+                                                    else
+                                                        action.addEffect(
+                                                                new DiscardCardFromDeckEffect(playerId, revealedCard));
+                                                }
+                                            }
+                                        });
                             }
                         }));
         return action;