From 5ee6bed33a5f336d539dbf9ffd5837bbfbae519e Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Sat, 13 May 2023 20:06:53 -0400
Subject: [PATCH] Cleanup SearchLibraryPutInHandOrOnBattlefieldEffect

---
 .../mage/cards/n/NazahnReveredBladesmith.java |  2 +-
 ...LibraryPutInHandOrOnBattlefieldEffect.java | 34 +++----------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java b/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java
index 10de52472fd..ace40bcf97c 100644
--- a/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java
+++ b/Mage.Sets/src/mage/cards/n/NazahnReveredBladesmith.java
@@ -57,7 +57,7 @@ public final class NazahnReveredBladesmith extends CardImpl {
 
         // When Nazahn, Revered Bladesmith enters the battlefield, search your library for an Equipment card and reveal it. If you reveal a card named Hammer of Nazahn this way, put it onto the battlefield. Otherwise, put that card into your hand. Then shuffle your library.
         TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter);
-        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandOrOnBattlefieldEffect(target, true, true, "Hammer of Nazahn"), false));
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandOrOnBattlefieldEffect(target, true, "Hammer of Nazahn"), false));
 
         // Whenever an equipped creature you control attacks, you may tap target creature defending player controls.
         Ability ability = new AttacksCreatureYouControlTriggeredAbility(new NazahnTapEffect(), true, equippedFilter, true);
diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java
index 8b98012d0f3..c6520fa74c2 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandOrOnBattlefieldEffect.java
@@ -20,28 +20,12 @@ import mage.util.CardUtil;
  */
 public class SearchLibraryPutInHandOrOnBattlefieldEffect extends SearchEffect {
 
-    private boolean revealCards = false;
-    private boolean forceShuffle;
-    private String rulePrefix;
-    private String nameToPutOnBattlefield = null;
-
-    public SearchLibraryPutInHandOrOnBattlefieldEffect(TargetCardInLibrary target, String nameToPutOnBattlefield) {
-        this(target, false, true, nameToPutOnBattlefield);
-    }
+    private boolean revealCards;
+    private String nameToPutOnBattlefield;
 
     public SearchLibraryPutInHandOrOnBattlefieldEffect(TargetCardInLibrary target, boolean revealCards, String nameToPutOnBattlefield) {
-        this(target, revealCards, true, nameToPutOnBattlefield);
-    }
-
-    public SearchLibraryPutInHandOrOnBattlefieldEffect(TargetCardInLibrary target, boolean revealCards, boolean forceShuffle, String nameToPutOnBattlefield) {
-        this(target, revealCards, forceShuffle, "search your library for ", nameToPutOnBattlefield);
-    }
-
-    public SearchLibraryPutInHandOrOnBattlefieldEffect(TargetCardInLibrary target, boolean revealCards, boolean forceShuffle, String rulePrefix, String nameToPutOnBattlefield) {
         super(target, Outcome.DrawCard);
         this.revealCards = revealCards;
-        this.forceShuffle = forceShuffle;
-        this.rulePrefix = rulePrefix;
         this.nameToPutOnBattlefield = nameToPutOnBattlefield;
         setText();
     }
@@ -49,8 +33,6 @@ public class SearchLibraryPutInHandOrOnBattlefieldEffect extends SearchEffect {
     public SearchLibraryPutInHandOrOnBattlefieldEffect(final SearchLibraryPutInHandOrOnBattlefieldEffect effect) {
         super(effect);
         this.revealCards = effect.revealCards;
-        this.forceShuffle = effect.forceShuffle;
-        this.rulePrefix = effect.rulePrefix;
         this.nameToPutOnBattlefield = effect.nameToPutOnBattlefield;
     }
 
@@ -98,15 +80,13 @@ public class SearchLibraryPutInHandOrOnBattlefieldEffect extends SearchEffect {
             controller.shuffleLibrary(source, game);
             return true;
         }
-        if (forceShuffle) {
-            controller.shuffleLibrary(source, game);
-        }
+        controller.shuffleLibrary(source, game);
         return false;
     }
 
     private void setText() {
         StringBuilder sb = new StringBuilder();
-        sb.append(rulePrefix);
+        sb.append("search your library for ");
         if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
             sb.append("up to ").append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
             sb.append(target.getTargetName()).append(revealCards ? ", reveal them," : "").append(" and put them into your hand");
@@ -118,11 +98,7 @@ public class SearchLibraryPutInHandOrOnBattlefieldEffect extends SearchEffect {
             sb.append(nameToPutOnBattlefield);
             sb.append("this way, you may put it onto the battlefield instead");
         }
-        if (forceShuffle) {
-            sb.append(". Then shuffle");
-        } else {
-            sb.append(". If you do, shuffle");
-        }
+        sb.append(". Then shuffle");
         staticText = sb.toString();
     }