Fix #10510 [ICE] Musician - lower taxes

Mage.Sets/src/mage/cards/m/Musician.java

@@ -9,6 +9,7 @@ import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.dynamicvalue.common.CountersSourceCount;
 import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.DestroySourceEffect;
 import mage.abilities.effects.common.DoUnlessControllerPaysEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
@@ -18,12 +19,14 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
 import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
 
 import java.util.UUID;
 
 /**
- * @author jeffwadsworth
+ * @author jeffwadsworth, Susucr
  */
 public final class Musician extends CardImpl {
 
@@ -38,34 +41,18 @@ public final class Musician extends CardImpl {
         // Cumulative upkeep {1}
         this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}")));
 
-        // {tap}: Put a music counter on target creature. If it doesn't have "At the beginning of your upkeep, destroy this creature unless you pay {1} for each music counter on it," it gains that ability.
-        Effect effect = new DoUnlessControllerPaysEffect(
-                new DestroySourceEffect(),
-                new DynamicValueGenericManaCost(
-                        new CountersSourceCount(CounterType.MUSIC),
-                        "{1} for each music counter on {this}"));
-        effect.setText("destroy this creature unless you pay {1} for each music counter on it");
-        Ability ability = new BeginningOfUpkeepTriggeredAbility(
-                Zone.BATTLEFIELD,
-                effect,
-                TargetController.YOU,
-                false,
-                false,
-                "At the beginning of your upkeep, ");
+        // {tap}: Put a music counter on target creature. If it doesn't have "At the beginning of your upkeep,
+        // destroy this creature unless you pay {1} for each music counter on it," it gains that ability
         Effect effect2 = new AddCountersTargetEffect(CounterType.MUSIC.createInstance());
         effect2.setText("Put a music counter on target creature");
-        Effect effect3 = new GainAbilityTargetEffect(
-                ability,
-                Duration.WhileOnBattlefield);
-        effect3.setText("If it doesn't have \"At the beginning of your upkeep, destroy this creature unless you pay {1} for each music counter on it,\" it gains that ability");
+
         Ability ability2 = new SimpleActivatedAbility(
                 Zone.BATTLEFIELD,
                 effect2,
                 new TapSourceCost());
         ability2.addTarget(new TargetCreaturePermanent());
-        ability2.addEffect(effect3);
+        ability2.addEffect(new MusicianEffect());
         this.addAbility(ability2);
-
     }
 
     private Musician(final Musician card) {
@@ -78,3 +65,66 @@ public final class Musician extends CardImpl {
     }
 }
 
+class MusicianEffect extends OneShotEffect {
+
+    MusicianEffect() {
+        super(Outcome.Benefit);
+        staticText = "If it doesn't have \"At the beginning of your upkeep, " +
+            "destroy this creature unless you pay {1} " +
+            "for each music counter on it,\" it gains that ability";
+    }
+
+    private MusicianEffect(final MusicianEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public MusicianEffect copy() {
+        return new MusicianEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent permanent = game.getPermanent(source.getFirstTarget());
+        if (permanent == null) {
+            return false;
+        }
+        if(permanent.getAbilities().stream().anyMatch(ability -> ability instanceof MusicianTriggerAbility)){
+            return true;
+        }
+
+        OneShotEffect effect = new DoUnlessControllerPaysEffect(
+            new DestroySourceEffect(),
+            new DynamicValueGenericManaCost(
+                new CountersSourceCount(CounterType.MUSIC),
+                "{1} for each music counter on {this}"));
+        effect.setText("destroy this creature unless you pay {1} for each music counter on it");
+
+        game.addEffect(new GainAbilityTargetEffect(
+            new MusicianTriggerAbility(effect),
+            Duration.WhileOnBattlefield), source);
+        return true;
+    }
+}
+
+// This wrapper class is used to identify if the targetted creature already has the ability.
+class MusicianTriggerAbility extends BeginningOfUpkeepTriggeredAbility  {
+    public MusicianTriggerAbility(OneShotEffect effect) {
+        super(
+            Zone.BATTLEFIELD,
+            effect,
+            TargetController.YOU,
+            false,
+            false,
+            "At the beginning of your upkeep, ");
+    }
+
+    private MusicianTriggerAbility(final MusicianTriggerAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public MusicianTriggerAbility copy() {
+        return new MusicianTriggerAbility(this);
+    }
+}