From 37cbc50a58dd00d45a4d5edc3f0b50e6853aba91 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 31 Jan 2016 09:50:46 +0100
Subject: [PATCH] * Flash of Insight - Fixed that its effect did not work from
 gaveyard.

---
 .../mage/sets/judgment/FlashOfInsight.java    | 48 +++++++++----------
 .../costs/common/ExileXFromYourGraveCost.java |  2 -
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/judgment/FlashOfInsight.java b/Mage.Sets/src/mage/sets/judgment/FlashOfInsight.java
index e5d93bd9abc..87908f21870 100644
--- a/Mage.Sets/src/mage/sets/judgment/FlashOfInsight.java
+++ b/Mage.Sets/src/mage/sets/judgment/FlashOfInsight.java
@@ -31,6 +31,8 @@ import java.util.UUID;
 import mage.MageObject;
 import mage.ObjectColor;
 import mage.abilities.Ability;
+import mage.abilities.costs.Cost;
+import mage.abilities.costs.common.ExileFromGraveCost;
 import mage.abilities.costs.common.ExileXFromYourGraveCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.OneShotEffect;
@@ -45,6 +47,8 @@ import mage.constants.Rarity;
 import mage.constants.TimingRule;
 import mage.constants.Zone;
 import mage.filter.FilterCard;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardIdPredicate;
 import mage.filter.predicate.mageobject.ColorPredicate;
 import mage.game.Game;
 import mage.players.Player;
@@ -56,21 +60,18 @@ import mage.target.TargetCard;
  */
 public class FlashOfInsight extends CardImpl {
 
-    private static final FilterCard filter = new FilterCard("blue cards from your graveyard");
-
-    static {
-        filter.add(new ColorPredicate(ObjectColor.BLUE));
-    }
-
     public FlashOfInsight(UUID ownerId) {
         super(ownerId, 40, "Flash of Insight", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{X}{1}{U}");
         this.expansionSetCode = "JUD";
 
-
         // Look at the top X cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
         this.getSpellAbility().addEffect(new FlashOfInsightEffect());
+
         // Flashback-{1}{U}, Exile X blue cards from your graveyard.
         Ability ability = new FlashbackAbility(new ManaCostsImpl("{1}{U}"), TimingRule.INSTANT);
+        FilterCard filter = new FilterCard("blue cards from your graveyard");
+        filter.add(new ColorPredicate(ObjectColor.BLUE));
+        filter.add(Predicates.not(new CardIdPredicate(getId())));
         ability.addCost(new ExileXFromYourGraveCost(filter));
         this.addAbility(ability);
     }
@@ -103,37 +104,34 @@ class FlashOfInsightEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Player player = game.getPlayer(source.getControllerId());
+        Player controller = game.getPlayer(source.getControllerId());
         MageObject sourceObject = game.getObject(source.getSourceId());
-        if (player == null || sourceObject == null) {
+        if (controller == null || sourceObject == null) {
             return false;
         }
 
-        int xValue;
-        xValue = source.getManaCostsToPay().getX();
+        int xValue = source.getManaCostsToPay().getX();
+
+        for (Cost cost : source.getCosts()) {
+            if (cost instanceof ExileFromGraveCost) {
+                xValue = ((ExileFromGraveCost) cost).getExiledCards().size();
+            }
+        }
 
         Cards cards = new CardsImpl();
-        int count = Math.min(player.getLibrary().size(), xValue);
-        for (int i = 0; i < count; i++) {
-            Card card = player.getLibrary().removeFromTop(game);
-            if (card != null) {
-                cards.add(card);
-            }
-        }
-        player.lookAtCards(sourceObject.getName(), cards, game);
+        cards.addAll(controller.getLibrary().getTopCards(game, xValue));
+        controller.lookAtCards(sourceObject.getIdName(), cards, game);
 
         TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put into your hand"));
-        if (player.choose(Outcome.DrawCard, cards, target, game)) {
+        target.setNotTarget(true);
+        if (controller.chooseTarget(Outcome.DrawCard, cards, target, source, game)) {
             Card card = cards.get(target.getFirstTarget(), game);
             if (card != null) {
+                controller.moveCards(card, Zone.HAND, source, game);
                 cards.remove(card);
-                card.moveToZone(Zone.HAND, source.getSourceId(), game, false);
-                game.informPlayers(sourceObject.getName() + ": " + player.getLogName() + " puts a card into his or her hand");
             }
         }
-
-        player.putCardsOnBottomOfLibrary(cards, game, source, true);
-
+        controller.putCardsOnBottomOfLibrary(cards, game, source, true);
         return true;
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileXFromYourGraveCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileXFromYourGraveCost.java
index b8d7d0b24fc..3ad13273657 100644
--- a/Mage/src/main/java/mage/abilities/costs/common/ExileXFromYourGraveCost.java
+++ b/Mage/src/main/java/mage/abilities/costs/common/ExileXFromYourGraveCost.java
@@ -55,7 +55,6 @@ public class ExileXFromYourGraveCost extends VariableCostImpl {
 
     public ExileXFromYourGraveCost(final ExileXFromYourGraveCost cost) {
         super(cost);
-        this.amountPaid = cost.amountPaid;
         this.filter = cost.filter;
     }
 
@@ -78,5 +77,4 @@ public class ExileXFromYourGraveCost extends VariableCostImpl {
         TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(xValue, filter);
         return new ExileFromGraveCost(target);
     }
-
 }