From a46bbfcd6031a00c923bdc5efc2c4a3e4628b180 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 21 Sep 2016 22:50:41 +0200
Subject: [PATCH] * Sequestered Stash - Fixed that the return to library effect
 was wrongly targeted.

---
 .../mage/sets/kaladesh/SequesteredStash.java  | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/kaladesh/SequesteredStash.java b/Mage.Sets/src/mage/sets/kaladesh/SequesteredStash.java
index 24d0e111b52..89080e4e5cc 100644
--- a/Mage.Sets/src/mage/sets/kaladesh/SequesteredStash.java
+++ b/Mage.Sets/src/mage/sets/kaladesh/SequesteredStash.java
@@ -33,15 +33,18 @@ import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.SacrificeSourceCost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.GenericManaCost;
-import mage.abilities.effects.Effect;
-import mage.abilities.effects.common.PutOnLibraryTargetEffect;
+import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveControllerEffect;
 import mage.abilities.mana.ColorlessManaAbility;
+import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
+import mage.constants.Outcome;
 import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.filter.common.FilterArtifactCard;
+import mage.game.Game;
+import mage.players.Player;
 import mage.target.common.TargetCardInYourGraveyard;
 
 /**
@@ -61,10 +64,7 @@ public class SequesteredStash extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTopCardOfLibraryIntoGraveControllerEffect(5), new GenericManaCost(4));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
-        Effect effect = new PutOnLibraryTargetEffect(true);
-        effect.setText("Then you may put an artifact card from your graveyard on top of your library");
-        ability.addEffect(effect);
-        ability.addTarget(new TargetCardInYourGraveyard(new FilterArtifactCard("artifact card from your graveyard")));
+        ability.addEffect(new SequesteredStashEffect());
         this.addAbility(ability);
 
     }
@@ -78,3 +78,39 @@ public class SequesteredStash extends CardImpl {
         return new SequesteredStash(this);
     }
 }
+
+class SequesteredStashEffect extends OneShotEffect {
+
+    public SequesteredStashEffect() {
+        super(Outcome.Benefit);
+        this.staticText = "Then you may put an artifact card from your graveyard on top of your library";
+    }
+
+    public SequesteredStashEffect(final SequesteredStashEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public SequesteredStashEffect copy() {
+        return new SequesteredStashEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller == null) {
+            return false;
+        }
+        TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(new FilterArtifactCard("artifact card from your graveyard"));
+        target.setNotTarget(true);
+        if (target.canChoose(source.getSourceId(), source.getControllerId(), game)
+                && controller.chooseUse(outcome, "Put an artifact card from your graveyard to library?", source, game)
+                && controller.choose(outcome, target, source.getSourceId(), game)) {
+            Card card = game.getCard(target.getFirstTarget());
+            if (card != null) {
+                controller.moveCards(card, Zone.LIBRARY, source, game);
+            }
+        }
+        return true;
+    }
+}