From 4c787423bcdf1143c2f957846bb8d64e898f8b19 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Sat, 13 May 2023 23:18:21 -0400
Subject: [PATCH] SearchLibraryPutInPlayEffect: remove forceshuffle parameter

---
 .../search/SearchLibraryPutInPlayEffect.java      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java
index 877dedeefee..2f12bb78e9e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java
@@ -18,7 +18,6 @@ import java.util.UUID;
 public class SearchLibraryPutInPlayEffect extends SearchEffect {
 
     protected boolean tapped;
-    protected boolean forceShuffle;
     protected boolean optional;
 
     public SearchLibraryPutInPlayEffect(TargetCardInLibrary target) {
@@ -30,13 +29,12 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect {
     }
 
     public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle) {
-        this(target, tapped, forceShuffle, false);
+        this(target, tapped, true, false);
     }
 
     public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle, boolean optional) {
         super(target, Outcome.PutCardInPlay);
         this.tapped = tapped;
-        this.forceShuffle = forceShuffle;
         this.optional = optional;
         if (target.getDescription().contains("land")) {
             this.outcome = Outcome.PutLandInPlay;
@@ -46,16 +44,15 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect {
         staticText = (optional ? "you may " : "")
                 + "search your library for "
                 + target.getDescription()
-                + (forceShuffle ? ", " : " and ")
+                + ", "
                 + (target.getMaxNumberOfTargets() > 1 ? "put them onto the battlefield" : "put it onto the battlefield")
                 + (tapped ? " tapped" : "")
-                + (forceShuffle ? ", then shuffle" : ". If you do, shuffle");
+                + ", then shuffle";
     }
 
     public SearchLibraryPutInPlayEffect(final SearchLibraryPutInPlayEffect effect) {
         super(effect);
         this.tapped = effect.tapped;
-        this.forceShuffle = effect.forceShuffle;
         this.optional = effect.optional;
     }
 
@@ -81,10 +78,8 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect {
             player.shuffleLibrary(source, game);
             return true;
         }
-        if (forceShuffle) {
-            player.shuffleLibrary(source, game);
-        }
-        return true;
+        player.shuffleLibrary(source, game);
+        return false;
     }
 
     public List<UUID> getTargets() {