diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index c66b25f6542..0f3e119f163 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -2009,7 +2009,7 @@ public class HumanPlayer extends PlayerImpl { int remainingDamage = damage; while (remainingDamage > 0 && canRespond()) { Target target = new TargetAnyTarget(); - target.setNotTarget(true); + target.withNotTarget(true); if (singleTargetName != null) { target.setTargetName(singleTargetName); } diff --git a/Mage.Sets/src/mage/cards/a/AcererakTheArchlich.java b/Mage.Sets/src/mage/cards/a/AcererakTheArchlich.java index 5ef2370dec9..9932cc4de58 100644 --- a/Mage.Sets/src/mage/cards/a/AcererakTheArchlich.java +++ b/Mage.Sets/src/mage/cards/a/AcererakTheArchlich.java @@ -102,7 +102,7 @@ class AcererakTheArchlichEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetControlledCreaturePermanent(0, 1); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.Sacrifice, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null && permanent.sacrifice(source, game)) { diff --git a/Mage.Sets/src/mage/cards/a/ActivatedSleeper.java b/Mage.Sets/src/mage/cards/a/ActivatedSleeper.java index eae000c43ef..6ee3e2ed6c0 100644 --- a/Mage.Sets/src/mage/cards/a/ActivatedSleeper.java +++ b/Mage.Sets/src/mage/cards/a/ActivatedSleeper.java @@ -90,7 +90,7 @@ class ActivatedSleeperEffect extends OneShotEffect { return false; } Target target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return true; } diff --git a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java index 6f252704e5e..7000cfb4456 100644 --- a/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java +++ b/Mage.Sets/src/mage/cards/a/AetherbornMarauder.java @@ -82,7 +82,7 @@ class AetherbornMarauderEffect extends OneShotEffect { if (controller.chooseUse(outcome, "Move " + (firstRun ? "any" : "more") + " +1/+1 counters from other permanents you control to " + sourceObject.getLogName() + '?', source, game)) { firstRun = false; TargetControlledPermanent target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.choose(Outcome.Neutral, source.getControllerId(), source.getSourceId(), source, game)) { Permanent fromPermanent = game.getPermanent(target.getFirstTarget()); if (fromPermanent != null) { diff --git a/Mage.Sets/src/mage/cards/a/AgitatorAnt.java b/Mage.Sets/src/mage/cards/a/AgitatorAnt.java index 02541574c22..1604478f548 100644 --- a/Mage.Sets/src/mage/cards/a/AgitatorAnt.java +++ b/Mage.Sets/src/mage/cards/a/AgitatorAnt.java @@ -85,7 +85,7 @@ class AgitatorAntEffect extends OneShotEffect { continue; } TargetPermanent targetPermanent = new TargetControlledCreaturePermanent(0, 1); - targetPermanent.setNotTarget(true); + targetPermanent.withNotTarget(true); player.choose(Outcome.BoostCreature, targetPermanent, source, game); Permanent permanent = game.getPermanent(targetPermanent.getFirstTarget()); if (permanent == null || !permanent.addCounters(CounterType.P1P1.createInstance(2), player.getId(), source, game)) { diff --git a/Mage.Sets/src/mage/cards/a/AgonizingRemorse.java b/Mage.Sets/src/mage/cards/a/AgonizingRemorse.java index 9a39cf935c4..606cbf73f08 100644 --- a/Mage.Sets/src/mage/cards/a/AgonizingRemorse.java +++ b/Mage.Sets/src/mage/cards/a/AgonizingRemorse.java @@ -73,12 +73,12 @@ class AgonizingRemorseEffect extends OneShotEffect { null, "Hand", "Graveyard", source, game)) { target = new TargetCard(Zone.HAND, new FilterNonlandCard("nonland card in " + opponent.getName() + "'s hand")); - target.setNotTarget(true); + target.withNotTarget(true); cards = opponent.getHand(); } else { target = new TargetCard(Zone.GRAVEYARD, new FilterCard("card in " + opponent.getName() + "'s graveyard")); - target.setNotTarget(true); + target.withNotTarget(true); cards = opponent.getGraveyard(); } if (controller.choose(outcome, cards, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/a/AkroanHorse.java b/Mage.Sets/src/mage/cards/a/AkroanHorse.java index fd8b2a27fb4..1e64edb98f9 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanHorse.java +++ b/Mage.Sets/src/mage/cards/a/AkroanHorse.java @@ -81,7 +81,7 @@ class AkroanHorseChangeControlEffect extends OneShotEffect { return false; } Target target = new TargetOpponent(); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(outcome, target, source, game); ContinuousEffect effect = new AkroanHorseGainControlEffect(Duration.Custom, target.getFirstTarget()); effect.setTargetPointer(new FixedTarget(source.getSourceId(), game)); diff --git a/Mage.Sets/src/mage/cards/a/AraumiOfTheDeadTide.java b/Mage.Sets/src/mage/cards/a/AraumiOfTheDeadTide.java index 1f6860cbe1a..8f1cf5a4f2f 100644 --- a/Mage.Sets/src/mage/cards/a/AraumiOfTheDeadTide.java +++ b/Mage.Sets/src/mage/cards/a/AraumiOfTheDeadTide.java @@ -95,7 +95,7 @@ class AraumiOfTheDeadTideCost extends CostImpl { } int oppCount = game.getOpponents(controllerId).size(); TargetCard target = new TargetCardInYourGraveyard(oppCount, StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.Exile, target, source, game); Cards cards = new CardsImpl(target.getTargets()); if (cards.size() < oppCount) { diff --git a/Mage.Sets/src/mage/cards/a/ArdentDustspeaker.java b/Mage.Sets/src/mage/cards/a/ArdentDustspeaker.java index a5317238953..4d43126ee77 100644 --- a/Mage.Sets/src/mage/cards/a/ArdentDustspeaker.java +++ b/Mage.Sets/src/mage/cards/a/ArdentDustspeaker.java @@ -63,7 +63,7 @@ class ArdentDustspeakerCost extends CostImpl { public ArdentDustspeakerCost() { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); this.text = "put an instant or sorcery card from your graveyard on the bottom of your library"; } diff --git a/Mage.Sets/src/mage/cards/a/ArmoredSkyhunter.java b/Mage.Sets/src/mage/cards/a/ArmoredSkyhunter.java index a01fdea34a7..c42b1cb811b 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredSkyhunter.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredSkyhunter.java @@ -99,7 +99,7 @@ class ArmoredSkyhunterEffect extends OneShotEffect { return player.putCardsOnBottomOfLibrary(cards, game, source, false); } TargetPermanent targetPermanent = new TargetControlledCreaturePermanent(0, 1); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); player.choose(outcome, targetPermanent, source, game); Permanent permanent = game.getPermanent(targetPermanent.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/a/AscentOfTheWorthy.java b/Mage.Sets/src/mage/cards/a/AscentOfTheWorthy.java index d459190b54d..0148dab9270 100644 --- a/Mage.Sets/src/mage/cards/a/AscentOfTheWorthy.java +++ b/Mage.Sets/src/mage/cards/a/AscentOfTheWorthy.java @@ -87,7 +87,7 @@ class AscentOfTheWorthyEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/a/AssemblyHall.java b/Mage.Sets/src/mage/cards/a/AssemblyHall.java index 0d07ecdf66b..3a4bd0b9811 100644 --- a/Mage.Sets/src/mage/cards/a/AssemblyHall.java +++ b/Mage.Sets/src/mage/cards/a/AssemblyHall.java @@ -76,7 +76,7 @@ class AssemblyHallEffect extends OneShotEffect { } Card cardToReveal = null; Target target = new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.chooseTarget(outcome, target, source, game)) { cardToReveal = game.getCard(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/a/AstarionsThirst.java b/Mage.Sets/src/mage/cards/a/AstarionsThirst.java index 57080004e14..35ed71dfd0b 100644 --- a/Mage.Sets/src/mage/cards/a/AstarionsThirst.java +++ b/Mage.Sets/src/mage/cards/a/AstarionsThirst.java @@ -90,7 +90,7 @@ class AstarionsThirstEffect extends OneShotEffect { break; default: TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); commander = game.getPermanent(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/a/AuraGraft.java b/Mage.Sets/src/mage/cards/a/AuraGraft.java index b13c78e091b..6c3fcb64e73 100644 --- a/Mage.Sets/src/mage/cards/a/AuraGraft.java +++ b/Mage.Sets/src/mage/cards/a/AuraGraft.java @@ -116,7 +116,7 @@ class AuraGraftMoveAuraEffect extends OneShotEffect { filter.add(new AuraGraftAuraCanEnchantPredicate(enchantment)); // extracts Targets from Aura spell ability filter.add(new CanBeEnchantedByPredicate(enchantment)); // checks for protection Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game) && controller.choose(outcome, target, source, game)) { Permanent newAttachment = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java index bba8246e880..8f630e275e3 100644 --- a/Mage.Sets/src/mage/cards/a/AuratouchedMage.java +++ b/Mage.Sets/src/mage/cards/a/AuratouchedMage.java @@ -67,7 +67,7 @@ class AuratouchedMageEffect extends OneShotEffect { filter.add(SubType.AURA.getPredicate()); filter.add(new AuraCardCanAttachToLKIPermanentId(source.getSourceId())); TargetCardInLibrary target = new TargetCardInLibrary(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.searchLibrary(target, source, game)) { if (target.getFirstTarget() != null) { Card aura = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java b/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java index 7ac2fd7e37c..23a0e22dcec 100644 --- a/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java +++ b/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java @@ -87,7 +87,7 @@ class AuthorOfShadowsEffect extends OneShotEffect { } TargetCard target = new TargetCardInExile(StaticFilters.FILTER_CARD_A_NON_LAND); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, cards, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheMaelstrom.java b/Mage.Sets/src/mage/cards/a/AwakenTheMaelstrom.java index e9bcdd3a7de..3558fb7e68d 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheMaelstrom.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheMaelstrom.java @@ -97,7 +97,7 @@ class AwakenTheMaelstromEffect extends OneShotEffect { private void makeToken(Player player, Game game, Ability source) { TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); target.withChooseHint("to copy"); if (!target.canChoose(player.getId(), source, game)) { return; @@ -114,7 +114,7 @@ class AwakenTheMaelstromEffect extends OneShotEffect { return; } TargetPermanentAmount target = new TargetCreaturePermanentAmount(3); - target.setNotTarget(true); + target.withNotTarget(true); target.withChooseHint("to distribute counters"); player.choose(outcome, target, source, game); for (UUID targetId : target.getTargets()) { diff --git a/Mage.Sets/src/mage/cards/a/AzraOddsmaker.java b/Mage.Sets/src/mage/cards/a/AzraOddsmaker.java index 28f4dc7f6b7..48bbe9bae31 100644 --- a/Mage.Sets/src/mage/cards/a/AzraOddsmaker.java +++ b/Mage.Sets/src/mage/cards/a/AzraOddsmaker.java @@ -81,7 +81,7 @@ class AzraOddsmakerEffect extends OneShotEffect { } Permanent permanent = null; TargetCreaturePermanent target = new TargetCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(Outcome.DrawCard, target, source, game)) { permanent = game.getPermanent(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java b/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java index 7f326f2d9b3..6a1d69a1301 100644 --- a/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java +++ b/Mage.Sets/src/mage/cards/b/BackFromTheBrink.java @@ -51,7 +51,7 @@ class BackFromTheBrinkCost extends CostImpl { public BackFromTheBrinkCost() { Target target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); this.text = "Exile a creature card from your graveyard and pay its mana cost"; } diff --git a/Mage.Sets/src/mage/cards/b/BagOfDevouring.java b/Mage.Sets/src/mage/cards/b/BagOfDevouring.java index c0a57fc5eb0..ccf323b84b6 100644 --- a/Mage.Sets/src/mage/cards/b/BagOfDevouring.java +++ b/Mage.Sets/src/mage/cards/b/BagOfDevouring.java @@ -112,7 +112,7 @@ class BagOfDevouringEffect extends OneShotEffect { 0, result, StaticFilters.FILTER_CARD, CardUtil.getExileZoneId(game, source) ); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); return true; diff --git a/Mage.Sets/src/mage/cards/b/BalduvianWarlord.java b/Mage.Sets/src/mage/cards/b/BalduvianWarlord.java index 91d23562437..377e76535b1 100644 --- a/Mage.Sets/src/mage/cards/b/BalduvianWarlord.java +++ b/Mage.Sets/src/mage/cards/b/BalduvianWarlord.java @@ -113,7 +113,7 @@ class BalduvianWarlordUnblockEffect extends OneShotEffect { FilterAttackingCreature filter = new FilterAttackingCreature("creature attacking " + targetsController.getLogName()); filter.add(new PermanentInListPredicate(list)); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game)) { while (!target.isChosen() && target.canChoose(controller.getId(), source, game) && controller.canRespond()) { controller.chooseTarget(outcome, target, source, game); diff --git a/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java b/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java index dd89d7004e1..ba2509f0d0e 100644 --- a/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java +++ b/Mage.Sets/src/mage/cards/b/BaneAlleyBroker.java @@ -156,7 +156,7 @@ class BaneAlleyBrokerReturnToHandEffect extends OneShotEffect { return false; } TargetCardInExile target = new TargetCardInExile(StaticFilters.FILTER_CARD, exile.getId()); - target.setNotTarget(true); + target.withNotTarget(true); player.chooseTarget(outcome, exile, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/b/BeamsplitterMage.java b/Mage.Sets/src/mage/cards/b/BeamsplitterMage.java index fbc6929796f..1bdb93421cf 100644 --- a/Mage.Sets/src/mage/cards/b/BeamsplitterMage.java +++ b/Mage.Sets/src/mage/cards/b/BeamsplitterMage.java @@ -163,7 +163,7 @@ class BeamsplitterMageEffect extends OneShotEffect { filter.add(AnotherPredicate.instance); filter.add(new BeamsplitterMagePredicate(spell)); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/b/BeckoningWillOWisp.java b/Mage.Sets/src/mage/cards/b/BeckoningWillOWisp.java index b6003d4ac04..71006a1e431 100644 --- a/Mage.Sets/src/mage/cards/b/BeckoningWillOWisp.java +++ b/Mage.Sets/src/mage/cards/b/BeckoningWillOWisp.java @@ -98,7 +98,7 @@ class BeckoningWillOWispEffect extends OneShotEffect { return false; } TargetOpponent target = new TargetOpponent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Player chosenPlayer = game.getPlayer(target.getFirstTarget()); if (chosenPlayer == null) { diff --git a/Mage.Sets/src/mage/cards/b/BerserkersFrenzy.java b/Mage.Sets/src/mage/cards/b/BerserkersFrenzy.java index 284eab7380a..141195e0e0e 100644 --- a/Mage.Sets/src/mage/cards/b/BerserkersFrenzy.java +++ b/Mage.Sets/src/mage/cards/b/BerserkersFrenzy.java @@ -98,7 +98,7 @@ class BerserkersFrenzyEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetCreaturePermanent(0, Integer.MAX_VALUE); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); game.addEffect(new BlocksIfAbleTargetEffect(Duration.EndOfTurn) .setTargetPointer(new FixedTargets(new CardsImpl(target.getTargets()), game)), source); diff --git a/Mage.Sets/src/mage/cards/b/BlackSunsTwilight.java b/Mage.Sets/src/mage/cards/b/BlackSunsTwilight.java index 68cb020df1b..b5d0950e465 100644 --- a/Mage.Sets/src/mage/cards/b/BlackSunsTwilight.java +++ b/Mage.Sets/src/mage/cards/b/BlackSunsTwilight.java @@ -81,7 +81,7 @@ class BlackSunsTwilightEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); return card != null && player.moveCards( diff --git a/Mage.Sets/src/mage/cards/b/BlessingOfFrost.java b/Mage.Sets/src/mage/cards/b/BlessingOfFrost.java index 6d522013e49..b7fb945cfd7 100644 --- a/Mage.Sets/src/mage/cards/b/BlessingOfFrost.java +++ b/Mage.Sets/src/mage/cards/b/BlessingOfFrost.java @@ -79,7 +79,7 @@ class BlessingOfFrostEffect extends OneShotEffect { int snow = ManaPaidSourceWatcher.getSnowPaid(source.getId(), game); if (snow > 0) { TargetAmount target = new TargetCreaturePermanentAmount(snow, StaticFilters.FILTER_CONTROLLED_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); target.chooseTarget(outcome, player.getId(), source, game); for (UUID targetId : target.getTargets()) { Permanent permanent = game.getPermanent(targetId); diff --git a/Mage.Sets/src/mage/cards/b/BloodClock.java b/Mage.Sets/src/mage/cards/b/BloodClock.java index f17f9752d49..9cf15efdd0a 100644 --- a/Mage.Sets/src/mage/cards/b/BloodClock.java +++ b/Mage.Sets/src/mage/cards/b/BloodClock.java @@ -72,7 +72,7 @@ class BloodClockEffect extends OneShotEffect { return true; } Target target = new TargetControlledPermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(player.getId(), source, game) || !player.chooseTarget(outcome, target, source, game)) { return false; diff --git a/Mage.Sets/src/mage/cards/b/BloodCurdle.java b/Mage.Sets/src/mage/cards/b/BloodCurdle.java index df33509b6b5..499cb28f2ae 100644 --- a/Mage.Sets/src/mage/cards/b/BloodCurdle.java +++ b/Mage.Sets/src/mage/cards/b/BloodCurdle.java @@ -65,7 +65,7 @@ class BloodCurdleEffect extends OneShotEffect { return false; } Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/b/BlossomingTortoise.java b/Mage.Sets/src/mage/cards/b/BlossomingTortoise.java index 666d715fc2d..f2b478ffaab 100644 --- a/Mage.Sets/src/mage/cards/b/BlossomingTortoise.java +++ b/Mage.Sets/src/mage/cards/b/BlossomingTortoise.java @@ -90,7 +90,7 @@ class BlossomingTortoiseEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_LAND); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); return card != null && player.moveCards(card, Zone.BATTLEFIELD, source, game, true, false, false, null); diff --git a/Mage.Sets/src/mage/cards/b/BlotOut.java b/Mage.Sets/src/mage/cards/b/BlotOut.java index 34ff9c028dd..65abb8e9870 100644 --- a/Mage.Sets/src/mage/cards/b/BlotOut.java +++ b/Mage.Sets/src/mage/cards/b/BlotOut.java @@ -99,7 +99,7 @@ class BlotOutEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); opponent.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/b/BodyDouble.java b/Mage.Sets/src/mage/cards/b/BodyDouble.java index 0aeb944e0fe..bd2c9b1930d 100644 --- a/Mage.Sets/src/mage/cards/b/BodyDouble.java +++ b/Mage.Sets/src/mage/cards/b/BodyDouble.java @@ -64,7 +64,7 @@ class BodyDoubleCopyEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); if (player != null) { Target target = new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard")); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game)) { player.choose(outcome, target, source, game); Card copyFromCard = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BreachTheMultiverse.java b/Mage.Sets/src/mage/cards/b/BreachTheMultiverse.java index c96e72cedef..8a86749ded4 100644 --- a/Mage.Sets/src/mage/cards/b/BreachTheMultiverse.java +++ b/Mage.Sets/src/mage/cards/b/BreachTheMultiverse.java @@ -79,7 +79,7 @@ class BreachTheMultiverseEffect extends OneShotEffect { } Cards cards = new CardsImpl(); TargetCard target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); if (player == null || player.getGraveyard().count(filter, game) < 1) { diff --git a/Mage.Sets/src/mage/cards/b/BreakingEntering.java b/Mage.Sets/src/mage/cards/b/BreakingEntering.java index 2cca2af2e2f..cf77bc8dc2e 100644 --- a/Mage.Sets/src/mage/cards/b/BreakingEntering.java +++ b/Mage.Sets/src/mage/cards/b/BreakingEntering.java @@ -70,7 +70,7 @@ class EnteringReturnFromGraveyardToBattlefieldEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { Target target = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game) && controller.chooseTarget(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BreathOfFury.java b/Mage.Sets/src/mage/cards/b/BreathOfFury.java index 1290d23a8f5..803b0bf0bcd 100644 --- a/Mage.Sets/src/mage/cards/b/BreathOfFury.java +++ b/Mage.Sets/src/mage/cards/b/BreathOfFury.java @@ -120,7 +120,7 @@ class BreathOfFuryEffect extends OneShotEffect { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control that could be enchanted by " + enchantment.getName()); filter.add(new CanBeEnchantedByPredicate(enchantment)); Target target = new TargetControlledCreaturePermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); // It's important to check that the creature was successfully sacrificed here. Effects that prevent sacrifice will also prevent Breath of Fury's effect from working. // Commanders going to the command zone and Rest in Peace style replacement effects don't make Permanent.sacrifice return false. if (enchantedCreature != null && controller != null diff --git a/Mage.Sets/src/mage/cards/b/BreenaTheDemagogue.java b/Mage.Sets/src/mage/cards/b/BreenaTheDemagogue.java index 43ac4ff6175..c95fe4221d7 100644 --- a/Mage.Sets/src/mage/cards/b/BreenaTheDemagogue.java +++ b/Mage.Sets/src/mage/cards/b/BreenaTheDemagogue.java @@ -130,7 +130,7 @@ class BreenaTheDemagogueEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); return permanent != null && permanent.addCounters( diff --git a/Mage.Sets/src/mage/cards/b/BronzehideLion.java b/Mage.Sets/src/mage/cards/b/BronzehideLion.java index 6cc85e14865..eac53bc1526 100644 --- a/Mage.Sets/src/mage/cards/b/BronzehideLion.java +++ b/Mage.Sets/src/mage/cards/b/BronzehideLion.java @@ -87,7 +87,7 @@ class BronzehideLionReturnEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(outcome, target, source, game) && game.getPermanent(target.getFirstTarget()) != null) { game.getState().setValue("attachTo:" + source.getSourceId(), target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java index 452abab707a..5a580bd8bf8 100644 --- a/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java +++ b/Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java @@ -92,7 +92,7 @@ class BrudicladTelchorEngineerEffect extends OneShotEffect { if (effect.apply(game, source)) { TargetControlledPermanent target = new TargetControlledPermanent(0, 1, filter, true); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.chooseUse(outcome, "Select a token to copy?", source, game) && controller.choose(Outcome.Neutral, target, source, game)) { Permanent toCopyFromPermanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java index 36a475f7718..1f3519573b4 100644 --- a/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java +++ b/Mage.Sets/src/mage/cards/b/BrunaLightOfAlabaster.java @@ -101,7 +101,7 @@ class BrunaLightOfAlabasterEffect extends OneShotEffect { && countBattlefield > 0 && controller.chooseUse(Outcome.Benefit, "Attach an Aura from the battlefield?", source, game)) { Target targetAura = new TargetPermanent(filterAura); - targetAura.setNotTarget(true); + targetAura.withNotTarget(true); if (!controller.choose(Outcome.Benefit, targetAura, source, game)) { continue; } Permanent aura = game.getPermanent(targetAura.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CallToTheVoid.java b/Mage.Sets/src/mage/cards/c/CallToTheVoid.java index 5a9c7cdc29e..8d544ab59a9 100644 --- a/Mage.Sets/src/mage/cards/c/CallToTheVoid.java +++ b/Mage.Sets/src/mage/cards/c/CallToTheVoid.java @@ -58,7 +58,7 @@ class CallToTheVoidEffect extends OneShotEffect { private void chooseCreature(Map> map, Set permanents, FilterPermanent filter, Player player, Ability source, Game game) { if (game.getBattlefield().count(filter, player.getId(), source, game) > 0) { TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/c/CankerAbomination.java b/Mage.Sets/src/mage/cards/c/CankerAbomination.java index 7b2fdce35e8..159f23c65c7 100644 --- a/Mage.Sets/src/mage/cards/c/CankerAbomination.java +++ b/Mage.Sets/src/mage/cards/c/CankerAbomination.java @@ -71,7 +71,7 @@ class CankerAbominationEffect extends OneShotEffect { Permanent cankerAbomination = game.getPermanentEntering(source.getSourceId()); if (controller != null && cankerAbomination != null) { Target target = new TargetOpponent(); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Player opponent = game.getPlayer(target.getFirstTarget()); if (opponent != null) { diff --git a/Mage.Sets/src/mage/cards/c/CanoptekWraith.java b/Mage.Sets/src/mage/cards/c/CanoptekWraith.java index b1951287f4d..16e238996e4 100644 --- a/Mage.Sets/src/mage/cards/c/CanoptekWraith.java +++ b/Mage.Sets/src/mage/cards/c/CanoptekWraith.java @@ -95,7 +95,7 @@ class CanoptekWraithEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/c/CauldronsGift.java b/Mage.Sets/src/mage/cards/c/CauldronsGift.java index 57c35972e19..9aa68982a15 100644 --- a/Mage.Sets/src/mage/cards/c/CauldronsGift.java +++ b/Mage.Sets/src/mage/cards/c/CauldronsGift.java @@ -75,7 +75,7 @@ class CauldronsGiftEffect extends OneShotEffect { return true; } TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, player.getGraveyard(), target, source, game)) { return true; } diff --git a/Mage.Sets/src/mage/cards/c/CelestialJudgment.java b/Mage.Sets/src/mage/cards/c/CelestialJudgment.java index c2b26a2bcf9..a1a1fd795b6 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialJudgment.java +++ b/Mage.Sets/src/mage/cards/c/CelestialJudgment.java @@ -90,7 +90,7 @@ class CelestialJudgmentEffect extends OneShotEffect { FilterPermanent filter = new FilterCreaturePermanent("creature with power " + entry.getKey() + " to save"); filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, entry.getKey())); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); toKeep.add(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/c/CemeteryDesecrator.java b/Mage.Sets/src/mage/cards/c/CemeteryDesecrator.java index 439ea276999..5ceb53e7acf 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryDesecrator.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryDesecrator.java @@ -87,7 +87,7 @@ class CemeteryDesecratorEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { TargetCardInGraveyard target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/c/CemeteryGatekeeper.java b/Mage.Sets/src/mage/cards/c/CemeteryGatekeeper.java index 68e52ca6787..5d6f53ed557 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryGatekeeper.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryGatekeeper.java @@ -82,7 +82,7 @@ class CemeteryGatekeeperEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { TargetCardInGraveyard target = new TargetCardInGraveyard(); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/c/CemeteryIlluminator.java b/Mage.Sets/src/mage/cards/c/CemeteryIlluminator.java index 160d30bba59..6e060f34d82 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryIlluminator.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryIlluminator.java @@ -87,7 +87,7 @@ class CemeteryIlluminatorExileEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { TargetCardInGraveyard target = new TargetCardInGraveyard(); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/c/CemeteryProtector.java b/Mage.Sets/src/mage/cards/c/CemeteryProtector.java index 53e733b1a1b..65462d3dc35 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryProtector.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryProtector.java @@ -83,7 +83,7 @@ class CemeteryProtectorEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { TargetCardInGraveyard target = new TargetCardInGraveyard(); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/c/CemeteryProwler.java b/Mage.Sets/src/mage/cards/c/CemeteryProwler.java index 2c841a7d97d..4b10f8bd64d 100644 --- a/Mage.Sets/src/mage/cards/c/CemeteryProwler.java +++ b/Mage.Sets/src/mage/cards/c/CemeteryProwler.java @@ -75,7 +75,7 @@ class CemeteryProwlerExileEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { TargetCardInGraveyard target = new TargetCardInGraveyard(); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java b/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java index 4d4e65e231a..1a9932fc4b5 100644 --- a/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java +++ b/Mage.Sets/src/mage/cards/c/CharmbreakerDevils.java @@ -76,7 +76,7 @@ class CharmbreakerDevilsEffect extends OneShotEffect { } TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_INSTANT_AND_SORCERY); target.setRandom(true); - target.setNotTarget(true); + target.withNotTarget(true); target.chooseTarget(outcome, player.getId(), source, game); Card card = game.getCard(target.getFirstTarget()); return card != null && player.moveCards(card, Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/c/CheckForTraps.java b/Mage.Sets/src/mage/cards/c/CheckForTraps.java index f41719005ac..9b13a00eb32 100644 --- a/Mage.Sets/src/mage/cards/c/CheckForTraps.java +++ b/Mage.Sets/src/mage/cards/c/CheckForTraps.java @@ -68,7 +68,7 @@ class CheckForTrapsEffect extends OneShotEffect { } opponent.revealCards(source, opponent.getHand(), game); TargetCard target = new TargetCard(Zone.HAND, StaticFilters.FILTER_CARD_NON_LAND); - target.setNotTarget(true); + target.withNotTarget(true); boolean opponentLoseLife = false; if (controller.choose(outcome, opponent.getHand(), target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/c/ChimneyImp.java b/Mage.Sets/src/mage/cards/c/ChimneyImp.java index f817a846733..6c137ca82f6 100644 --- a/Mage.Sets/src/mage/cards/c/ChimneyImp.java +++ b/Mage.Sets/src/mage/cards/c/ChimneyImp.java @@ -73,7 +73,7 @@ class ChimneyImpEffect extends OneShotEffect { if (targetOpponent != null) { if (!targetOpponent.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); - target.setNotTarget(true); + target.withNotTarget(true); target.setTargetName("a card from your hand to put on top of your library"); targetOpponent.choose(Outcome.Detriment, target, source, game); Card card = targetOpponent.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/c/ChitteringRats.java b/Mage.Sets/src/mage/cards/c/ChitteringRats.java index a9ff004eda8..ff2302a5e3a 100644 --- a/Mage.Sets/src/mage/cards/c/ChitteringRats.java +++ b/Mage.Sets/src/mage/cards/c/ChitteringRats.java @@ -70,7 +70,7 @@ class ChitteringRatsEffect extends OneShotEffect { if (targetOpponent != null) { if (!targetOpponent.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); - target.setNotTarget(true); + target.withNotTarget(true); target.setTargetName("a card from your hand to put on top of your library"); targetOpponent.choose(Outcome.Detriment, target, source, game); Card card = targetOpponent.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/c/ChokingMiasma.java b/Mage.Sets/src/mage/cards/c/ChokingMiasma.java index 387f2146d85..1ad04d476f6 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingMiasma.java +++ b/Mage.Sets/src/mage/cards/c/ChokingMiasma.java @@ -74,7 +74,7 @@ class ChokingMiasmaEffect extends OneShotEffect { return false; } TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(controller.getId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/ChromeMox.java b/Mage.Sets/src/mage/cards/c/ChromeMox.java index 0c5f47e9c4f..f4edf3ccf21 100644 --- a/Mage.Sets/src/mage/cards/c/ChromeMox.java +++ b/Mage.Sets/src/mage/cards/c/ChromeMox.java @@ -78,7 +78,7 @@ class ChromeMoxEffect extends OneShotEffect { MageObject sourceObject = source.getSourceObject(game); if (controller != null && sourceObject != null) { TargetCard target = new TargetCard(Zone.HAND, filter); - target.setNotTarget(true); + target.withNotTarget(true); Card cardToImprint = null; Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (!controller.getHand().isEmpty() && controller.choose(Outcome.Benefit, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/c/CinderheartGiant.java b/Mage.Sets/src/mage/cards/c/CinderheartGiant.java index 41edce72e3b..5ee70aade9d 100644 --- a/Mage.Sets/src/mage/cards/c/CinderheartGiant.java +++ b/Mage.Sets/src/mage/cards/c/CinderheartGiant.java @@ -75,7 +75,7 @@ class CinderheartGiantEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetOpponentsCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); target.setRandom(true); target.chooseTarget(outcome, player.getId(), source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CirdanTheShipwright.java b/Mage.Sets/src/mage/cards/c/CirdanTheShipwright.java index 004974b57e9..fefde56d6e7 100644 --- a/Mage.Sets/src/mage/cards/c/CirdanTheShipwright.java +++ b/Mage.Sets/src/mage/cards/c/CirdanTheShipwright.java @@ -121,7 +121,7 @@ class CirdanTheShipwrightVote extends VoteHandler { @Override protected Player playerChoose(String voteInfo, Player player, Player decidingPlayer, Ability source, Game game) { TargetPlayer target = new TargetPlayer(); - target.setNotTarget(true); + target.withNotTarget(true); target.withChooseHint("to vote for"); decidingPlayer.choose(Outcome.Benefit, target, source, game); return game.getPlayer(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/c/ClackbridgeTroll.java b/Mage.Sets/src/mage/cards/c/ClackbridgeTroll.java index 12609ef38c0..4bf4bf2e09a 100644 --- a/Mage.Sets/src/mage/cards/c/ClackbridgeTroll.java +++ b/Mage.Sets/src/mage/cards/c/ClackbridgeTroll.java @@ -93,7 +93,7 @@ class ClackbridgeTrollEffect extends OneShotEffect { continue; } TargetControlledPermanent target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(opponent.getId(), source, game) || !opponent.chooseUse(Outcome.AIDontUseIt, "Sacrifice a creature?", source, game) || !opponent.choose(Outcome.Sacrifice, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/c/ClarionUltimatum.java b/Mage.Sets/src/mage/cards/c/ClarionUltimatum.java index 2835ac886e3..610125e2688 100644 --- a/Mage.Sets/src/mage/cards/c/ClarionUltimatum.java +++ b/Mage.Sets/src/mage/cards/c/ClarionUltimatum.java @@ -72,7 +72,7 @@ class ClarionUltimatumEffect extends OneShotEffect { source.getControllerId(), source, game ); TargetPermanent targetPermanent = new TargetControlledPermanent(Math.max(permCount, 5)); - targetPermanent.setNotTarget(true); + targetPermanent.withNotTarget(true); player.choose(outcome, targetPermanent, source, game); Set names = targetPermanent .getTargets() diff --git a/Mage.Sets/src/mage/cards/c/ConfoundingConundrum.java b/Mage.Sets/src/mage/cards/c/ConfoundingConundrum.java index e8ceb3d5a4a..b8bf0b977d5 100644 --- a/Mage.Sets/src/mage/cards/c/ConfoundingConundrum.java +++ b/Mage.Sets/src/mage/cards/c/ConfoundingConundrum.java @@ -105,7 +105,7 @@ class ConfoundingConundrumEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(1, StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(player.getId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/c/ConniveConcoct.java b/Mage.Sets/src/mage/cards/c/ConniveConcoct.java index 5cd00455179..8dea9e461e0 100644 --- a/Mage.Sets/src/mage/cards/c/ConniveConcoct.java +++ b/Mage.Sets/src/mage/cards/c/ConniveConcoct.java @@ -92,7 +92,7 @@ class ConcoctEffect extends OneShotEffect { } player.surveil(3, source, game); Target target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(outcome, target, source, game)) { Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); effect.setTargetPointer(new FixedTarget(target.getFirstTarget(), game)); diff --git a/Mage.Sets/src/mage/cards/c/ConsumingTide.java b/Mage.Sets/src/mage/cards/c/ConsumingTide.java index 01834bd2d68..33c6551ae30 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingTide.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingTide.java @@ -69,7 +69,7 @@ class ConsumingTideEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { TargetNonlandPermanent target = new TargetNonlandPermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.Benefit, target, source, game); UUID permId = target.getFirstTarget(); if (permId != null) { diff --git a/Mage.Sets/src/mage/cards/c/ContractualSafeguard.java b/Mage.Sets/src/mage/cards/c/ContractualSafeguard.java index 3c20fdd61c3..b22289e1627 100644 --- a/Mage.Sets/src/mage/cards/c/ContractualSafeguard.java +++ b/Mage.Sets/src/mage/cards/c/ContractualSafeguard.java @@ -81,7 +81,7 @@ class ContractualSafeguardFirstEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.withChooseHint("to give a shield counter").setNotTarget(true); + target.withChooseHint("to give a shield counter").withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); return permanent != null && permanent.addCounters(CounterType.SHIELD.createInstance(), source, game); @@ -120,7 +120,7 @@ class ContractualSafeguardSecondEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/c/CorpseChurn.java b/Mage.Sets/src/mage/cards/c/CorpseChurn.java index dd337e59ea5..405bd6f3fd6 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseChurn.java +++ b/Mage.Sets/src/mage/cards/c/CorpseChurn.java @@ -63,7 +63,7 @@ class CorpseChurnEffect extends OneShotEffect { return false; } TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game) && controller.chooseUse(outcome, "Return a creature card from your graveyard to hand?", source, game) && controller.choose(Outcome.ReturnToHand, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/c/CouncilsJudgment.java b/Mage.Sets/src/mage/cards/c/CouncilsJudgment.java index bc6f5f584e0..7a670b62e9d 100644 --- a/Mage.Sets/src/mage/cards/c/CouncilsJudgment.java +++ b/Mage.Sets/src/mage/cards/c/CouncilsJudgment.java @@ -99,7 +99,7 @@ class CouncilsJudgmentVote extends VoteHandler { } TargetPermanent target = new TargetPermanent(1, filter); target.withChooseHint(voteInfo + " (to exile)"); - target.setNotTarget(true); + target.withNotTarget(true); decidingPlayer.choose(Outcome.Exile, target, source, game); return game.getPermanent(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java b/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java index 112a06f0fe3..872d1b3eda6 100644 --- a/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java +++ b/Mage.Sets/src/mage/cards/c/CreamOfTheCrop.java @@ -76,7 +76,7 @@ class CreamOfTheCropEffect extends OneShotEffect { Cards cards = new CardsImpl(controller.getLibrary().getTopCards(game, permanent.getPower().getValue())); if (!cards.isEmpty()) { TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put on top of your library")); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(Outcome.Benefit, cards, target, source, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/c/CreepingInn.java b/Mage.Sets/src/mage/cards/c/CreepingInn.java index 81125611374..14355c0fcfd 100644 --- a/Mage.Sets/src/mage/cards/c/CreepingInn.java +++ b/Mage.Sets/src/mage/cards/c/CreepingInn.java @@ -83,7 +83,7 @@ class CreepingInnEffect extends OneShotEffect { if (player != null && permanent != null) { UUID exileId = CardUtil.getExileZoneId(game, source); TargetCardInGraveyard target = new TargetCardInGraveyard(0, 1, StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(player.getId(), source, game)) { if (player.choose(Outcome.Exile, target, source, game)) { Card cardChosen = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java index 2201e4b4702..9f6f89044cf 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfTheAges.java @@ -89,7 +89,7 @@ class CrownOfTheAgesEffect extends OneShotEffect { filterChoice.add(Predicates.not(new PermanentIdPredicate(fromPermanent.getId()))); Target chosenCreatureToAttachAura = new TargetPermanent(filterChoice); - chosenCreatureToAttachAura.setNotTarget(true); + chosenCreatureToAttachAura.withNotTarget(true); if (chosenCreatureToAttachAura.canChoose(source.getControllerId(), source, game) && controller.choose(Outcome.Neutral, chosenCreatureToAttachAura, source, game)) { diff --git a/Mage.Sets/src/mage/cards/c/CruelReality.java b/Mage.Sets/src/mage/cards/c/CruelReality.java index 125e25d4d52..8e65acd2d2f 100644 --- a/Mage.Sets/src/mage/cards/c/CruelReality.java +++ b/Mage.Sets/src/mage/cards/c/CruelReality.java @@ -85,7 +85,7 @@ class CruelRealityEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(cursedPlayer.getId(), source, game) && cursedPlayer.choose(Outcome.Sacrifice, target, source, game)) { Permanent objectToBeSacrificed = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfLeeches.java b/Mage.Sets/src/mage/cards/c/CurseOfLeeches.java index 1a3feffa656..ba8c8908a9a 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfLeeches.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfLeeches.java @@ -82,7 +82,7 @@ class CurseOfLeechesEffect extends ReplacementEffectImpl { return false; } TargetPlayer target = new TargetPlayer(); - target.withChooseHint("Player to attach to").setNotTarget(true); + target.withChooseHint("Player to attach to").withNotTarget(true); controller.choose(Outcome.Detriment, target, source, game); Permanent permanent = source.getSourcePermanentIfItStillExists(game); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java index d920fae9e8e..d2bf520e4ce 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java @@ -85,7 +85,7 @@ class CurseOfThePiercedHeartEffect extends OneShotEffect { FilterPermanent filter = new FilterPlaneswalkerPermanent("a planeswalker controlled by " + opponent.getLogName()); filter.add(new ControllerIdPredicate(opponent.getId())); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/c/CustodiSquire.java b/Mage.Sets/src/mage/cards/c/CustodiSquire.java index a49bf541210..2366be6df83 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSquire.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSquire.java @@ -110,7 +110,7 @@ class CustodiSquireVote extends VoteHandler { } TargetCardInGraveyard target = new TargetCardInGraveyard(filter); target.withChooseHint(voteInfo + " (from graveyard to hand)"); - target.setNotTarget(true); + target.withNotTarget(true); decidingPlayer.choose(Outcome.ReturnToHand, controller.getGraveyard(), target, source, game); return controller.getGraveyard().get(target.getFirstTarget(), game); } diff --git a/Mage.Sets/src/mage/cards/d/DanithaBenaliasHope.java b/Mage.Sets/src/mage/cards/d/DanithaBenaliasHope.java index c4bcc781667..2957f5a5c86 100644 --- a/Mage.Sets/src/mage/cards/d/DanithaBenaliasHope.java +++ b/Mage.Sets/src/mage/cards/d/DanithaBenaliasHope.java @@ -95,7 +95,7 @@ class DanithaBenaliasHopeEffect extends OneShotEffect { } else { target = new TargetCardInYourGraveyard(filter); } - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game)) { controller.chooseTarget(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/d/DanseMacabre.java b/Mage.Sets/src/mage/cards/d/DanseMacabre.java index 42ecea6093c..18febb8800d 100644 --- a/Mage.Sets/src/mage/cards/d/DanseMacabre.java +++ b/Mage.Sets/src/mage/cards/d/DanseMacabre.java @@ -86,7 +86,7 @@ class DanseMacabreEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE_NON_TOKEN); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.Sacrifice, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { @@ -117,7 +117,7 @@ class DanseMacabreEffect extends OneShotEffect { } else { return true; } - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(Outcome.PutCreatureInPlay, target, source, game); controller.moveCards(new CardsImpl(target.getTargets()), Zone.BATTLEFIELD, source, game); return true; diff --git a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java index e637f81d39f..d5dce49e4c1 100644 --- a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java +++ b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java @@ -93,7 +93,7 @@ class DawnbreakReclaimerEffect extends OneShotEffect { TargetCard chosenCreatureOpponentGraveyard = new TargetCard(Zone.GRAVEYARD, filter); Player opponent = null; Card cardOpponentGraveyard = null; - chosenCreatureOpponentGraveyard.setNotTarget(true); + chosenCreatureOpponentGraveyard.withNotTarget(true); if (chosenCreatureOpponentGraveyard.canChoose(source.getControllerId(), source, game)) { controller.choose(Outcome.Detriment, chosenCreatureOpponentGraveyard, source, game); cardOpponentGraveyard = game.getCard(chosenCreatureOpponentGraveyard.getFirstTarget()); @@ -124,7 +124,7 @@ class DawnbreakReclaimerEffect extends OneShotEffect { new FilterCreatureCard("a creature card in " + controller.getName() + "'s the graveyard"); filterCreatureCard.add(new OwnerIdPredicate(controller.getId())); TargetCardInGraveyard targetControllerGaveyard = new TargetCardInGraveyard(filterCreatureCard); - targetControllerGaveyard.setNotTarget(true); + targetControllerGaveyard.withNotTarget(true); Card controllerCreatureCard = null; if (targetControllerGaveyard.canChoose(opponent.getId(), source, game) && opponent.choose(outcome, targetControllerGaveyard, source, game)) { diff --git a/Mage.Sets/src/mage/cards/d/DeadlyBrew.java b/Mage.Sets/src/mage/cards/d/DeadlyBrew.java index dae32ade18f..32ea8267ef7 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyBrew.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyBrew.java @@ -80,7 +80,7 @@ class DeadlyBrewEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(playerId, source, game)) { continue; } diff --git a/Mage.Sets/src/mage/cards/d/DeathbonnetHulk.java b/Mage.Sets/src/mage/cards/d/DeathbonnetHulk.java index dfe959fbd40..df16cdc6491 100644 --- a/Mage.Sets/src/mage/cards/d/DeathbonnetHulk.java +++ b/Mage.Sets/src/mage/cards/d/DeathbonnetHulk.java @@ -72,7 +72,7 @@ class DeathbonnetHulkEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInGraveyard(0, 1); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/d/DeathsOasis.java b/Mage.Sets/src/mage/cards/d/DeathsOasis.java index 87a307e3418..d4ff9a10f91 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsOasis.java +++ b/Mage.Sets/src/mage/cards/d/DeathsOasis.java @@ -129,7 +129,7 @@ class DeathsOasisEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, player.getGraveyard(), target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/d/DebtToTheKami.java b/Mage.Sets/src/mage/cards/d/DebtToTheKami.java index 8942d39ff60..2aebfc5c6c0 100644 --- a/Mage.Sets/src/mage/cards/d/DebtToTheKami.java +++ b/Mage.Sets/src/mage/cards/d/DebtToTheKami.java @@ -72,7 +72,7 @@ class DebtToTheKamiExileCreatureEffect extends OneShotEffect { return false; } Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { @@ -111,7 +111,7 @@ class DebtToTheKamiExileEnchantmentEffect extends OneShotEffect { return false; } Target target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/d/DeeprootWayfinder.java b/Mage.Sets/src/mage/cards/d/DeeprootWayfinder.java index 75c8bfdeeab..5da6ef1a880 100644 --- a/Mage.Sets/src/mage/cards/d/DeeprootWayfinder.java +++ b/Mage.Sets/src/mage/cards/d/DeeprootWayfinder.java @@ -70,7 +70,7 @@ class DeeprootWayfinderEffect extends OneShotEffect { } player.surveil(1, source, game); TargetCard target = new TargetCardInYourGraveyard(0, 1, StaticFilters.FILTER_CARD_LAND_A); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); return player.moveCards( diff --git a/Mage.Sets/src/mage/cards/d/DefilerOfSouls.java b/Mage.Sets/src/mage/cards/d/DefilerOfSouls.java index 4e10c0a36a2..5d6197042c8 100644 --- a/Mage.Sets/src/mage/cards/d/DefilerOfSouls.java +++ b/Mage.Sets/src/mage/cards/d/DefilerOfSouls.java @@ -79,7 +79,7 @@ class DefilerOfSoulsEffect extends OneShotEffect { amount = Math.min(1, realCount); Target target = new TargetControlledPermanent(amount, amount, filter, false); - target.setNotTarget(true); + target.withNotTarget(true); //A spell or ability could have removed the only legal target this player //had, if thats the case this ability should fizzle. diff --git a/Mage.Sets/src/mage/cards/d/DeliverUntoEvil.java b/Mage.Sets/src/mage/cards/d/DeliverUntoEvil.java index aa64db0bbd2..d8758cd8d5b 100644 --- a/Mage.Sets/src/mage/cards/d/DeliverUntoEvil.java +++ b/Mage.Sets/src/mage/cards/d/DeliverUntoEvil.java @@ -84,7 +84,7 @@ class DeliverUntoEvilEffect extends OneShotEffect { return player.moveCards(cards, Zone.HAND, source, game); } TargetOpponent targetOpponent = new TargetOpponent(); - targetOpponent.setNotTarget(true); + targetOpponent.withNotTarget(true); if (!player.choose(outcome, targetOpponent, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/d/DemonicHordes.java b/Mage.Sets/src/mage/cards/d/DemonicHordes.java index 1501e53464b..f604e1be562 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicHordes.java +++ b/Mage.Sets/src/mage/cards/d/DemonicHordes.java @@ -92,14 +92,14 @@ class DemonicHordesEffect extends OneShotEffect { } demonicHordes.tap(source, game); Target choiceOpponent = new TargetOpponent(); - choiceOpponent.setNotTarget(true); + choiceOpponent.withNotTarget(true); FilterLandPermanent filterLand = new FilterLandPermanent(); filterLand.add(new ControllerIdPredicate(source.getControllerId())); if (controller.choose(Outcome.Neutral, choiceOpponent, source, game)) { Player opponent = game.getPlayer(choiceOpponent.getFirstTarget()); if (opponent != null) { Target chosenLand = new TargetLandPermanent(filterLand); - chosenLand.setNotTarget(true); + chosenLand.withNotTarget(true); if (opponent.chooseTarget(Outcome.Sacrifice, chosenLand, source, game)) { Permanent land = game.getPermanent(chosenLand.getFirstTarget()); if (land != null) { diff --git a/Mage.Sets/src/mage/cards/d/Dermotaxi.java b/Mage.Sets/src/mage/cards/d/Dermotaxi.java index 675717c2dbf..88971b76f50 100644 --- a/Mage.Sets/src/mage/cards/d/Dermotaxi.java +++ b/Mage.Sets/src/mage/cards/d/Dermotaxi.java @@ -84,7 +84,7 @@ class DermotaxiImprintEffect extends OneShotEffect { return false; } TargetCardInGraveyard target = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/d/DesecrateReality.java b/Mage.Sets/src/mage/cards/d/DesecrateReality.java index 4224d3e99e2..4e5015d26c3 100644 --- a/Mage.Sets/src/mage/cards/d/DesecrateReality.java +++ b/Mage.Sets/src/mage/cards/d/DesecrateReality.java @@ -123,7 +123,7 @@ class DesecrateRealityEffect extends OneShotEffect { // return a permanent card with an odd mana value from your graveyard to the battlefield. Target target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(outcome, target, source, game)) { Effect effect = new ReturnFromGraveyardToBattlefieldTargetEffect(); effect.setTargetPointer(new FixedTarget(target.getFirstTarget(), game)); diff --git a/Mage.Sets/src/mage/cards/d/Desolation.java b/Mage.Sets/src/mage/cards/d/Desolation.java index e71475caaf7..274deadc4ab 100644 --- a/Mage.Sets/src/mage/cards/d/Desolation.java +++ b/Mage.Sets/src/mage/cards/d/Desolation.java @@ -68,7 +68,7 @@ class DesolationEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(player.getId(), source, game)) { continue; } diff --git a/Mage.Sets/src/mage/cards/d/DigUpTheBody.java b/Mage.Sets/src/mage/cards/d/DigUpTheBody.java index 847f7e29be2..ed3914a75ac 100644 --- a/Mage.Sets/src/mage/cards/d/DigUpTheBody.java +++ b/Mage.Sets/src/mage/cards/d/DigUpTheBody.java @@ -66,7 +66,7 @@ class DigUpTheBodyEffect extends OneShotEffect { } player.millCards(2, source, game); TargetCard target = new TargetCardInYourGraveyard(0, 1, StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return true; } diff --git a/Mage.Sets/src/mage/cards/d/DimensionalBreach.java b/Mage.Sets/src/mage/cards/d/DimensionalBreach.java index daa8c6f7ca7..6560ce4cc04 100644 --- a/Mage.Sets/src/mage/cards/d/DimensionalBreach.java +++ b/Mage.Sets/src/mage/cards/d/DimensionalBreach.java @@ -163,7 +163,7 @@ class DimensionalBreachReturnEffect extends OneShotEffect { } if (cards.size() > 1) { TargetCard target = new TargetCardInExile(StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, cards, target, source, game); cards.clear(); cards.add(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/d/DiscerningFinancier.java b/Mage.Sets/src/mage/cards/d/DiscerningFinancier.java index c88321a6bf2..83c3d30546a 100644 --- a/Mage.Sets/src/mage/cards/d/DiscerningFinancier.java +++ b/Mage.Sets/src/mage/cards/d/DiscerningFinancier.java @@ -108,7 +108,7 @@ class DiscerningFinancierEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { TargetPlayer target = new TargetPlayer(filter); - target.setNotTarget(true); + target.withNotTarget(true); Permanent treasure = game.getPermanent(source.getFirstTarget()); if (treasure == null || !target.canChoose(source.getControllerId(), source, game)) { return false; diff --git a/Mage.Sets/src/mage/cards/d/DoomForetold.java b/Mage.Sets/src/mage/cards/d/DoomForetold.java index 6a59095a0da..05d74966188 100644 --- a/Mage.Sets/src/mage/cards/d/DoomForetold.java +++ b/Mage.Sets/src/mage/cards/d/DoomForetold.java @@ -85,7 +85,7 @@ class DoomForetoldEffect extends OneShotEffect { filter2.add(new ControllerIdPredicate(player.getId())); if (game.getBattlefield().contains(filter2, source, game, 1)) { TargetPermanent target = new TargetPermanent(filter2); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(Outcome.Sacrifice, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null && permanent.sacrifice(source, game)) { diff --git a/Mage.Sets/src/mage/cards/d/Doomfall.java b/Mage.Sets/src/mage/cards/d/Doomfall.java index 030c2aff728..98247b13540 100644 --- a/Mage.Sets/src/mage/cards/d/Doomfall.java +++ b/Mage.Sets/src/mage/cards/d/Doomfall.java @@ -73,7 +73,7 @@ class DoomfallEffect extends OneShotEffect { Player targetPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (targetPlayer != null) { Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (targetPlayer.choose(outcome, target, source, game)) { targetPlayer.moveCards(game.getPermanent(target.getFirstTarget()), Zone.EXILED, source, game); } diff --git a/Mage.Sets/src/mage/cards/d/Doomgape.java b/Mage.Sets/src/mage/cards/d/Doomgape.java index db4cc41cd93..838514591b7 100644 --- a/Mage.Sets/src/mage/cards/d/Doomgape.java +++ b/Mage.Sets/src/mage/cards/d/Doomgape.java @@ -73,7 +73,7 @@ class DoomgapeEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(Outcome.Sacrifice, target, source, game)) { Permanent creature = game.getPermanent(target.getFirstTarget()); if (creature != null) { diff --git a/Mage.Sets/src/mage/cards/d/DrakeFamiliar.java b/Mage.Sets/src/mage/cards/d/DrakeFamiliar.java index a0a58e5b397..c527af9d2c6 100644 --- a/Mage.Sets/src/mage/cards/d/DrakeFamiliar.java +++ b/Mage.Sets/src/mage/cards/d/DrakeFamiliar.java @@ -65,7 +65,7 @@ class DrakeFamiliarEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ENCHANTMENT); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game) && controller.chooseUse(outcome, "Return an enchantment to its owner's hand?", source, game)) { controller.chooseTarget(Outcome.ReturnToHand, target, source, game); diff --git a/Mage.Sets/src/mage/cards/d/DranaTheLastBloodchief.java b/Mage.Sets/src/mage/cards/d/DranaTheLastBloodchief.java index 80a58ce5aa6..2efee6e6e30 100644 --- a/Mage.Sets/src/mage/cards/d/DranaTheLastBloodchief.java +++ b/Mage.Sets/src/mage/cards/d/DranaTheLastBloodchief.java @@ -92,7 +92,7 @@ class DranaTheLastBloodchiefEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, controller.getGraveyard(), target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/d/DreamsOfSteelAndOil.java b/Mage.Sets/src/mage/cards/d/DreamsOfSteelAndOil.java index 19718fe67a7..4db8ed0140d 100644 --- a/Mage.Sets/src/mage/cards/d/DreamsOfSteelAndOil.java +++ b/Mage.Sets/src/mage/cards/d/DreamsOfSteelAndOil.java @@ -71,7 +71,7 @@ class DreamsOfSteelAndOilEffect extends OneShotEffect { FilterCard filter = new FilterCard("artifact or creature card from " + opponent.getName() + "'s hand"); filter.add(Predicates.or(CardType.ARTIFACT.getPredicate(), CardType.CREATURE.getPredicate())); TargetCard target = new TargetCard(Zone.HAND, filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(Outcome.Discard, opponent.getHand(), target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card != null) { @@ -80,7 +80,7 @@ class DreamsOfSteelAndOilEffect extends OneShotEffect { filter.setMessage("artifact or creature card from " + opponent.getName() + "'s graveyard"); target = new TargetCard(Zone.GRAVEYARD, filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(Outcome.Exile, opponent.getGraveyard(), target, source, game); card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/d/DredgeTheMire.java b/Mage.Sets/src/mage/cards/d/DredgeTheMire.java index 9c061c2b959..c373a90ccc6 100644 --- a/Mage.Sets/src/mage/cards/d/DredgeTheMire.java +++ b/Mage.Sets/src/mage/cards/d/DredgeTheMire.java @@ -69,7 +69,7 @@ class DredgeTheMireEffect extends OneShotEffect { continue; } TargetCard target = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, player.getGraveyard(), target, source, game)) { continue; } diff --git a/Mage.Sets/src/mage/cards/d/DropOfHoney.java b/Mage.Sets/src/mage/cards/d/DropOfHoney.java index e329ea024d7..c04e62bb26d 100644 --- a/Mage.Sets/src/mage/cards/d/DropOfHoney.java +++ b/Mage.Sets/src/mage/cards/d/DropOfHoney.java @@ -88,7 +88,7 @@ class DropOfHoneyEffect extends OneShotEffect { FilterCreaturePermanent filter = new FilterCreaturePermanent("one of the creatures with the least power"); filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, leastPower)); Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game)) { if (controller.choose(outcome, target, source, game)) { permanentToDestroy = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/d/DruidOfPurification.java b/Mage.Sets/src/mage/cards/d/DruidOfPurification.java index 7839dcefe59..71fecb50fa7 100644 --- a/Mage.Sets/src/mage/cards/d/DruidOfPurification.java +++ b/Mage.Sets/src/mage/cards/d/DruidOfPurification.java @@ -80,7 +80,7 @@ class DruidOfPurificationEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(0, 1, filter); - target.setNotTarget(true); + target.withNotTarget(true); Set permanents = new HashSet<>(); for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player = game.getPlayer(playerId); diff --git a/Mage.Sets/src/mage/cards/e/EcologicalAppreciation.java b/Mage.Sets/src/mage/cards/e/EcologicalAppreciation.java index 9a65355bb72..2300d63134e 100644 --- a/Mage.Sets/src/mage/cards/e/EcologicalAppreciation.java +++ b/Mage.Sets/src/mage/cards/e/EcologicalAppreciation.java @@ -78,7 +78,7 @@ class EcologicalAppreciationEffect extends OneShotEffect { FilterCard filter = new FilterCreatureCard(); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); TargetCardInLibrary targetCardsInLibrary = new TargetCardWithDifferentNameInLibrary(0, 4, filter); - targetCardsInLibrary.setNotTarget(true); + targetCardsInLibrary.withNotTarget(true); targetCardsInLibrary.withChooseHint("Step 1 of 2: Search library"); player.searchLibrary(targetCardsInLibrary, source, game); Cards cards = new CardsImpl(targetCardsInLibrary.getTargets()); @@ -102,7 +102,7 @@ class EcologicalAppreciationEffect extends OneShotEffect { return isValidTarget(card, checkList); } }; - targetCardsInGY.setNotTarget(true); + targetCardsInGY.withNotTarget(true); targetCardsInGY.withChooseHint("Step 2 of 2: Search graveyard"); player.choose(Outcome.PutCreatureInPlay, player.getGraveyard(), targetCardsInGY, source, game); cards.addAll(targetCardsInGY.getTargets()); @@ -113,13 +113,13 @@ class EcologicalAppreciationEffect extends OneShotEffect { } TargetOpponent targetOpponent = new TargetOpponent(); - targetOpponent.setNotTarget(true); + targetOpponent.withNotTarget(true); player.choose(outcome, targetOpponent, source, game); Player opponent = game.getPlayer(targetOpponent.getFirstTarget()); if (opponent != null) { TargetCard chosenCards = new TargetCard(2, Zone.ALL, StaticFilters.FILTER_CARD); - chosenCards.setNotTarget(true); + chosenCards.withNotTarget(true); opponent.choose(outcome, cards, chosenCards, source, game); Cards toShuffle = new CardsImpl(chosenCards.getTargets().stream() .map(game::getCard) diff --git a/Mage.Sets/src/mage/cards/e/ElrondOfTheWhiteCouncil.java b/Mage.Sets/src/mage/cards/e/ElrondOfTheWhiteCouncil.java index 0b301773f34..f921f460dd1 100644 --- a/Mage.Sets/src/mage/cards/e/ElrondOfTheWhiteCouncil.java +++ b/Mage.Sets/src/mage/cards/e/ElrondOfTheWhiteCouncil.java @@ -111,7 +111,7 @@ class ElrondOfWhiteCouncilEffect extends OneShotEffect { // (2023-06-16): If you have multiple votes, you can vote for fellowship multiple times. If you do, you can choose the same creature each time. for (int i = 0; i < countFellowship; ++i) { TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(1); - target.setNotTarget(true); + target.withNotTarget(true); if (player.chooseTarget(Outcome.Detriment, target, source, game)) { Permanent chosen = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/e/EmergentUltimatum.java b/Mage.Sets/src/mage/cards/e/EmergentUltimatum.java index 254546b61ad..e2f0d73a582 100644 --- a/Mage.Sets/src/mage/cards/e/EmergentUltimatum.java +++ b/Mage.Sets/src/mage/cards/e/EmergentUltimatum.java @@ -75,7 +75,7 @@ class EmergentUltimatumEffect extends OneShotEffect { return false; } TargetCardInLibrary targetCardInLibrary = new TargetCardWithDifferentNameInLibrary(0, 3, filter); - targetCardInLibrary.setNotTarget(true); + targetCardInLibrary.withNotTarget(true); boolean searched = player.searchLibrary(targetCardInLibrary, source, game); Cards cards = new CardsImpl(targetCardInLibrary.getTargets()); player.moveCards(cards, Zone.EXILED, source, game); @@ -86,7 +86,7 @@ class EmergentUltimatumEffect extends OneShotEffect { return false; } TargetOpponent targetOpponent = new TargetOpponent(); - targetOpponent.setNotTarget(true); + targetOpponent.withNotTarget(true); player.choose(outcome, targetOpponent, source, game); Player opponent = game.getPlayer(targetOpponent.getFirstTarget()); if (opponent == null) { @@ -96,7 +96,7 @@ class EmergentUltimatumEffect extends OneShotEffect { return false; } TargetCardInExile targetCardInExile = new TargetCardInExile(StaticFilters.FILTER_CARD); - targetCardInExile.setNotTarget(true); + targetCardInExile.withNotTarget(true); opponent.choose(outcome, cards, targetCardInExile, source, game); Card toShuffle = game.getCard(targetCardInExile.getFirstTarget()); if (toShuffle != null) { diff --git a/Mage.Sets/src/mage/cards/e/EmptyTheLaboratory.java b/Mage.Sets/src/mage/cards/e/EmptyTheLaboratory.java index dd9e856e39d..bbee1c5c643 100644 --- a/Mage.Sets/src/mage/cards/e/EmptyTheLaboratory.java +++ b/Mage.Sets/src/mage/cards/e/EmptyTheLaboratory.java @@ -81,7 +81,7 @@ class EmptyTheLaboratoryEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(toSacrifice, filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.Sacrifice, target, source, game); int sacrificed = 0; for (UUID permanentId : target.getTargets()) { diff --git a/Mage.Sets/src/mage/cards/e/EndlessHorizons.java b/Mage.Sets/src/mage/cards/e/EndlessHorizons.java index e5a3899e76c..9d1b4034796 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessHorizons.java +++ b/Mage.Sets/src/mage/cards/e/EndlessHorizons.java @@ -115,7 +115,7 @@ class EndlessHorizonsEffect2 extends OneShotEffect { TargetCard target = new TargetCardInExile( 0, 1, filter, CardUtil.getExileZoneId(game, source) ); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); return card != null && controller.moveCards(card, Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/e/EnslavedHorror.java b/Mage.Sets/src/mage/cards/e/EnslavedHorror.java index 96ccd7cf08f..9b8b23a6d94 100644 --- a/Mage.Sets/src/mage/cards/e/EnslavedHorror.java +++ b/Mage.Sets/src/mage/cards/e/EnslavedHorror.java @@ -77,7 +77,7 @@ class EnslavedHorrorEffect extends OneShotEffect { FilterCreatureCard filterCreatureCard = new FilterCreatureCard("creature card from your graveyard"); filterCreatureCard.add(new OwnerIdPredicate(playerId)); TargetCardInGraveyard target = new TargetCardInGraveyard(0, 1, filterCreatureCard); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(playerId, source, game) && player.chooseTarget(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/e/EntrailsFeaster.java b/Mage.Sets/src/mage/cards/e/EntrailsFeaster.java index 7c17f7aa02d..a7fdfa3dec8 100644 --- a/Mage.Sets/src/mage/cards/e/EntrailsFeaster.java +++ b/Mage.Sets/src/mage/cards/e/EntrailsFeaster.java @@ -69,7 +69,7 @@ class EntrailsFeasterEffect extends OneShotEffect { if (controller != null && source.getSourceId() != null) { Permanent sourceObject = source.getSourcePermanentIfItStillExists(game); TargetCardInGraveyard target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game) && controller.chooseUse(outcome, "Exile a creature card from a graveyard?", source, game)) { if (controller.choose(Outcome.Exile, target, source, game)) { Card cardChosen = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/e/Exhume.java b/Mage.Sets/src/mage/cards/e/Exhume.java index c0de24ec1de..11c74a1db7a 100644 --- a/Mage.Sets/src/mage/cards/e/Exhume.java +++ b/Mage.Sets/src/mage/cards/e/Exhume.java @@ -67,7 +67,7 @@ class ExhumeEffect extends OneShotEffect { FilterCreatureCard filterCreatureCard = new FilterCreatureCard("creature card from your graveyard"); filterCreatureCard.add(new OwnerIdPredicate(playerId)); TargetCardInGraveyard target = new TargetCardInGraveyard(filterCreatureCard); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(playerId, source, game) && player.chooseTarget(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/e/ExoticPets.java b/Mage.Sets/src/mage/cards/e/ExoticPets.java index 41bf2012dfe..441ed8c7749 100644 --- a/Mage.Sets/src/mage/cards/e/ExoticPets.java +++ b/Mage.Sets/src/mage/cards/e/ExoticPets.java @@ -108,7 +108,7 @@ class ExoticPetsEffect extends OneShotEffect { .map(PermanentIdPredicate::new) .collect(Collectors.toSet()))); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); for (CounterType counterType : counterTypes) { target.clearChosen(); target.withChooseHint("to add " + counterType.getArticle() + ' ' + counterType + " counter to"); diff --git a/Mage.Sets/src/mage/cards/e/Expropriate.java b/Mage.Sets/src/mage/cards/e/Expropriate.java index 1bc3ec39eee..2a5c30b985a 100644 --- a/Mage.Sets/src/mage/cards/e/Expropriate.java +++ b/Mage.Sets/src/mage/cards/e/Expropriate.java @@ -100,7 +100,7 @@ class ExpropriateEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetPermanent(moneyCount, filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.GainControl, target, source, game); target.getTargets() .stream() diff --git a/Mage.Sets/src/mage/cards/e/Extirpate.java b/Mage.Sets/src/mage/cards/e/Extirpate.java index 989ce601681..8c94be7352f 100644 --- a/Mage.Sets/src/mage/cards/e/Extirpate.java +++ b/Mage.Sets/src/mage/cards/e/Extirpate.java @@ -105,7 +105,7 @@ class ExtirpateEffect extends OneShotEffect { // search cards in hand filterNamedCard.setMessage("card named " + chosenCard.getLogName() + " in the hand of " + owner.getLogName()); TargetCard targetCardInHand = new TargetCard(0, Integer.MAX_VALUE, Zone.HAND, filterNamedCard); - targetCardInHand.setNotTarget(true); + targetCardInHand.withNotTarget(true); if (controller.chooseTarget(Outcome.Exile, owner.getHand(), targetCardInHand, source, game)) { List targets = targetCardInHand.getTargets(); for (UUID targetId : targets) { diff --git a/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java b/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java index 49054494bd4..d9ef8049f59 100644 --- a/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java +++ b/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java @@ -63,7 +63,7 @@ class ExtractFromDarknessEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { Target target = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game) && controller.chooseTarget(outcome, target, source, game)) { return controller.moveCards(game.getCard(target.getFirstTarget()), Zone.BATTLEFIELD, source, game); diff --git a/Mage.Sets/src/mage/cards/e/EyeOfDoom.java b/Mage.Sets/src/mage/cards/e/EyeOfDoom.java index 58536e9c409..5d5bdd27451 100644 --- a/Mage.Sets/src/mage/cards/e/EyeOfDoom.java +++ b/Mage.Sets/src/mage/cards/e/EyeOfDoom.java @@ -78,7 +78,7 @@ class EyeOfDoomEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { Mappermanents=new HashMap<>(); Target target = new TargetNonlandPermanent(); - target.setNotTarget(true); + target.withNotTarget(true); PlayerList playerList = game.getPlayerList().copy(); playerList.setCurrent(game.getActivePlayerId()); Player player = game.getPlayer(game.getActivePlayerId()); diff --git a/Mage.Sets/src/mage/cards/f/FallOfTheThran.java b/Mage.Sets/src/mage/cards/f/FallOfTheThran.java index a1c9cd03dbe..85bf84182c6 100644 --- a/Mage.Sets/src/mage/cards/f/FallOfTheThran.java +++ b/Mage.Sets/src/mage/cards/f/FallOfTheThran.java @@ -79,7 +79,7 @@ class FallOfTheThranReturnEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if(player != null) { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(2, 2, StaticFilters.FILTER_CARD_LAND); - target.setNotTarget(true); + target.withNotTarget(true); target.setTargetController(playerId); if (target.canChoose(playerId, source, game)) { player.choose(outcome, target, source, game); diff --git a/Mage.Sets/src/mage/cards/f/FalseOrders.java b/Mage.Sets/src/mage/cards/f/FalseOrders.java index af3a10d107a..f189e992428 100644 --- a/Mage.Sets/src/mage/cards/f/FalseOrders.java +++ b/Mage.Sets/src/mage/cards/f/FalseOrders.java @@ -127,7 +127,7 @@ class FalseOrdersUnblockEffect extends OneShotEffect { FilterAttackingCreature filter = new FilterAttackingCreature("creature attacking " + targetsController.getLogName()); filter.add(new PermanentInListPredicate(list)); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game)) { while (!target.isChosen() && target.canChoose(controller.getId(), source, game) && controller.canRespond()) { controller.chooseTarget(outcome, target, source, game); diff --git a/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java b/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java index a7da49123b8..57c35de1089 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfTheVictoriousDead.java @@ -36,7 +36,7 @@ public final class FeastOfTheVictoriousDead extends CardImpl { ability.addEffect(new DistributeCountersEffect(CounterType.P1P1, 1, "") .setText("and distribute that many +1/+1 counters among creatures you control")); Target target = new TargetCreaturePermanentAmount(CreaturesDiedThisTurnCount.instance, StaticFilters.FILTER_CONTROLLED_CREATURES); - target.setNotTarget(true); + target.withNotTarget(true); ability.addTarget(target); this.addAbility(ability.addHint(CreaturesDiedThisTurnHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/f/FeldonRonomExcavator.java b/Mage.Sets/src/mage/cards/f/FeldonRonomExcavator.java index 290efc58dad..7ff09d22702 100644 --- a/Mage.Sets/src/mage/cards/f/FeldonRonomExcavator.java +++ b/Mage.Sets/src/mage/cards/f/FeldonRonomExcavator.java @@ -87,7 +87,7 @@ class FeldonRonomExcavatorEffect extends OneShotEffect { break; default: TargetCard target = new TargetCardInExile(StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, cards, target, source, game); card = game.getCard(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/f/FindFinality.java b/Mage.Sets/src/mage/cards/f/FindFinality.java index 609f697ee47..45b4bf5d8f5 100644 --- a/Mage.Sets/src/mage/cards/f/FindFinality.java +++ b/Mage.Sets/src/mage/cards/f/FindFinality.java @@ -82,7 +82,7 @@ class FinalityEffect extends OneShotEffect { return false; } Target target = new TargetControlledCreaturePermanent(0, 1); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose( Outcome.BoostCreature, target, source, game )) { diff --git a/Mage.Sets/src/mage/cards/f/FirstResponder.java b/Mage.Sets/src/mage/cards/f/FirstResponder.java index 2bd3634a1b8..d9c7fd9aca4 100644 --- a/Mage.Sets/src/mage/cards/f/FirstResponder.java +++ b/Mage.Sets/src/mage/cards/f/FirstResponder.java @@ -75,7 +75,7 @@ class FirstResponderEffect extends OneShotEffect { TargetPermanent target = new TargetPermanent( 0, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE ); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.ReturnToHand, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenCrypt.java b/Mage.Sets/src/mage/cards/f/ForbiddenCrypt.java index c35ac5b5df3..397400bd49d 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenCrypt.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenCrypt.java @@ -67,7 +67,7 @@ class ForbiddenCryptDrawCardReplacementEffect extends ReplacementEffectImpl { if (controller != null) { boolean cardReturned = false; TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game)) { if (target.choose(Outcome.ReturnToHand, controller.getId(), source.getSourceId(), source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/f/ForgottenLore.java b/Mage.Sets/src/mage/cards/f/ForgottenLore.java index f1802d60489..39eefd6a36f 100644 --- a/Mage.Sets/src/mage/cards/f/ForgottenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForgottenLore.java @@ -71,7 +71,7 @@ class ForgottenLoreEffect extends OneShotEffect { boolean done = false; do { chosenCard = new TargetCardInGraveyard(filter); - chosenCard.setNotTarget(true); + chosenCard.withNotTarget(true); if (chosenCard.canChoose(opponent.getId(), source, game)) { opponent.chooseTarget(Outcome.ReturnToHand, chosenCard, source, game); card = game.getCard(chosenCard.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/f/FortunateFew.java b/Mage.Sets/src/mage/cards/f/FortunateFew.java index 17ad5a29e6a..719451bcd1a 100644 --- a/Mage.Sets/src/mage/cards/f/FortunateFew.java +++ b/Mage.Sets/src/mage/cards/f/FortunateFew.java @@ -74,7 +74,7 @@ class FortunateFewEffect extends OneShotEffect { } Target target = new TargetNonlandPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(Outcome.Exile, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/f/FrayingLine.java b/Mage.Sets/src/mage/cards/f/FrayingLine.java index eb66b734b01..aec8e5c0fb0 100644 --- a/Mage.Sets/src/mage/cards/f/FrayingLine.java +++ b/Mage.Sets/src/mage/cards/f/FrayingLine.java @@ -97,7 +97,7 @@ class FrayingLineEffect extends OneShotEffect { return true; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/g/GenesisWave.java b/Mage.Sets/src/mage/cards/g/GenesisWave.java index 5adbb477f92..ba7e429c3b7 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisWave.java +++ b/Mage.Sets/src/mage/cards/g/GenesisWave.java @@ -66,7 +66,7 @@ class GenesisWaveEffect extends OneShotEffect { FilterCard filter = new FilterPermanentCard("cards with mana value " + xValue + " or less to put onto the battlefield"); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.LIBRARY, filter); - target1.setNotTarget(true); + target1.withNotTarget(true); controller.choose(Outcome.PutCardInPlay, cards, target1, source, game); Cards toBattlefield = new CardsImpl(target1.getTargets()); cards.removeAll(toBattlefield); diff --git a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java index 63af38912c6..da1208b901c 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java +++ b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java @@ -80,7 +80,7 @@ class GhastlordOfFugueEffect extends OneShotEffect { // You choose a card from it TargetCard target = new TargetCard(Zone.HAND, new FilterCard()); - target.setNotTarget(true); + target.withNotTarget(true); Card chosenCard = null; if (controller.chooseTarget(Outcome.Benefit, targetPlayer.getHand(), target, source, game)) { chosenCard = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/g/Ghoulraiser.java b/Mage.Sets/src/mage/cards/g/Ghoulraiser.java index 84ea5154629..a94a16552cd 100644 --- a/Mage.Sets/src/mage/cards/g/Ghoulraiser.java +++ b/Mage.Sets/src/mage/cards/g/Ghoulraiser.java @@ -73,7 +73,7 @@ class GhoulraiserEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); target.setRandom(true); target.chooseTarget(outcome, player.getId(), source, game); return player.moveCards(game.getCard(target.getFirstTarget()), Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/g/GhoulsNightOut.java b/Mage.Sets/src/mage/cards/g/GhoulsNightOut.java index 86f1ba5d8ef..148b04e8899 100644 --- a/Mage.Sets/src/mage/cards/g/GhoulsNightOut.java +++ b/Mage.Sets/src/mage/cards/g/GhoulsNightOut.java @@ -79,7 +79,7 @@ class GhoulsNightOutEffect extends OneShotEffect { if (creatureInGraveyard) { FilterCreatureCard filter = new FilterCreatureCard("creature card in " + player.getName() + "'s graveyard"); TargetCard target = new TargetCard(Zone.GRAVEYARD, filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(controllerId.equals(playerId) ? Outcome.Benefit : Outcome.Detriment, player.getGraveyard(), target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/g/GideonsSacrifice.java b/Mage.Sets/src/mage/cards/g/GideonsSacrifice.java index d4fc9a84db1..a066ea95ea2 100644 --- a/Mage.Sets/src/mage/cards/g/GideonsSacrifice.java +++ b/Mage.Sets/src/mage/cards/g/GideonsSacrifice.java @@ -79,7 +79,7 @@ class GideonsSacrificeEffect extends OneShotEffect { return false; } Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java index 9ecc9968e06..758f280ef50 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java @@ -119,7 +119,7 @@ class GiftOfDoomEffect extends OneShotEffect { return false; } TargetCreaturePermanent target = new TargetCreaturePermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(outcome, target, source, game) && game.getPermanent(target.getFirstTarget()) != null && !game.getPermanent(target.getFirstTarget()).cantBeAttachedBy(giftOfDoom, source, game, false)) { diff --git a/Mage.Sets/src/mage/cards/g/GisasFavoriteShovel.java b/Mage.Sets/src/mage/cards/g/GisasFavoriteShovel.java index 3529b3e55c7..47c38b06448 100644 --- a/Mage.Sets/src/mage/cards/g/GisasFavoriteShovel.java +++ b/Mage.Sets/src/mage/cards/g/GisasFavoriteShovel.java @@ -83,7 +83,7 @@ class LucilleEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(player.getId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/g/GishathSunsAvatar.java b/Mage.Sets/src/mage/cards/g/GishathSunsAvatar.java index 5735949331a..dcaf0700d9f 100644 --- a/Mage.Sets/src/mage/cards/g/GishathSunsAvatar.java +++ b/Mage.Sets/src/mage/cards/g/GishathSunsAvatar.java @@ -90,7 +90,7 @@ class GishathSunsAvatarEffect extends OneShotEffect { FilterCreatureCard filter = new FilterCreatureCard("Dinosaur creature cards"); filter.add(SubType.DINOSAUR.getPredicate()); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.LIBRARY, filter); - target1.setNotTarget(true); + target1.withNotTarget(true); controller.choose(Outcome.PutCardInPlay, cards, target1, source, game); Cards toBattlefield = new CardsImpl(target1.getTargets()); cards.removeAll(toBattlefield); diff --git a/Mage.Sets/src/mage/cards/g/GixsCommand.java b/Mage.Sets/src/mage/cards/g/GixsCommand.java index 118e274a72d..075df3ce584 100644 --- a/Mage.Sets/src/mage/cards/g/GixsCommand.java +++ b/Mage.Sets/src/mage/cards/g/GixsCommand.java @@ -98,7 +98,7 @@ class GixsCommandCounterEffect extends OneShotEffect { return false; } TargetCreaturePermanent target = new TargetCreaturePermanent(0, 1); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/g/GlamerSpinners.java b/Mage.Sets/src/mage/cards/g/GlamerSpinners.java index 135212959c8..0a9cd87f16a 100644 --- a/Mage.Sets/src/mage/cards/g/GlamerSpinners.java +++ b/Mage.Sets/src/mage/cards/g/GlamerSpinners.java @@ -97,7 +97,7 @@ class GlamerSpinnersEffect extends OneShotEffect { filterChoice.add(Predicates.not(new PermanentIdPredicate(targetPermanent.getId()))); Target chosenPermanentToAttachAuras = new TargetPermanent(filterChoice); - chosenPermanentToAttachAuras.setNotTarget(true); + chosenPermanentToAttachAuras.withNotTarget(true); LinkedList auras = new LinkedList<>(); auras.addAll(targetPermanent.getAttachments()); diff --git a/Mage.Sets/src/mage/cards/g/GlintHawk.java b/Mage.Sets/src/mage/cards/g/GlintHawk.java index deeb51a55f4..6d46fa629cf 100644 --- a/Mage.Sets/src/mage/cards/g/GlintHawk.java +++ b/Mage.Sets/src/mage/cards/g/GlintHawk.java @@ -68,7 +68,7 @@ class GlintHawkEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game) && controller.chooseUse(outcome, "Return an artifact you control to its owner's hand?", source, game)) { controller.chooseTarget(Outcome.ReturnToHand, target, source, game); diff --git a/Mage.Sets/src/mage/cards/g/GluntchTheBestower.java b/Mage.Sets/src/mage/cards/g/GluntchTheBestower.java index 7c8a426aec6..9a3c9a38164 100644 --- a/Mage.Sets/src/mage/cards/g/GluntchTheBestower.java +++ b/Mage.Sets/src/mage/cards/g/GluntchTheBestower.java @@ -86,7 +86,7 @@ class GluntchTheBestowerEffect extends OneShotEffect { // TargetPlayer playerChoice = new TargetPlayer(); - playerChoice.setNotTarget(true); + playerChoice.withNotTarget(true); playerChoice.setTargetName("a player that will put two +1/+1 counters on a creature they control"); controller.choose(Outcome.BoostCreature, playerChoice, source, game); @@ -98,7 +98,7 @@ class GluntchTheBestowerEffect extends OneShotEffect { game.informPlayers(firstChosenPlayer.getLogName() + " has been chosen for the first effect."); TargetPermanent targetChosenCreature = new TargetControlledCreaturePermanent(); - targetChosenCreature.setNotTarget(true); + targetChosenCreature.withNotTarget(true); playerChoice.setTargetName("a creature you control to add two +1/+1 counters on it"); firstChosenPlayer.choose(Outcome.BoostCreature, targetChosenCreature, source, game); @@ -115,7 +115,7 @@ class GluntchTheBestowerEffect extends OneShotEffect { FilterPlayer filterNotFirst = new FilterPlayer(); filterNotFirst.add(Predicates.not(new PlayerIdPredicate(firstChosenPlayerId))); playerChoice = new TargetPlayer(filterNotFirst); - playerChoice.setNotTarget(true); + playerChoice.withNotTarget(true); playerChoice.setTargetName("a player that will draw a card"); controller.choose(Outcome.DrawCard, playerChoice, source, game); @@ -137,7 +137,7 @@ class GluntchTheBestowerEffect extends OneShotEffect { filterNotFirstNorSecond.add(Predicates.not(new PlayerIdPredicate(firstChosenPlayerId))); filterNotFirstNorSecond.add(Predicates.not(new PlayerIdPredicate(secondChosenPlayerId))); playerChoice = new TargetPlayer(filterNotFirstNorSecond); - playerChoice.setNotTarget(true); + playerChoice.withNotTarget(true); playerChoice.setTargetName("a player that will create two Treasure tokens"); controller.choose(Outcome.DrawCard, playerChoice, source, game); diff --git a/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java b/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java index 8d9cf0cc156..d43cbdd2926 100644 --- a/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java +++ b/Mage.Sets/src/mage/cards/g/GlyphOfReincarnation.java @@ -108,7 +108,7 @@ class GlyphOfReincarnationEffect extends OneShotEffect { FilterCreatureCard filter = new FilterCreatureCard("a creature card from " + player.getName() + "'s graveyard"); filter.add(new OwnerIdPredicate(player.getId())); Target targetCreature = new TargetCardInGraveyard(filter); - targetCreature.setNotTarget(true); + targetCreature.withNotTarget(true); if (targetCreature.canChoose(controller.getId(), source, game) && controller.chooseTarget(outcome, targetCreature, source, game)) { Card card = game.getCard(targetCreature.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/g/GoblinAssassin.java b/Mage.Sets/src/mage/cards/g/GoblinAssassin.java index 9ff79b9becc..bbcac83dde6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinAssassin.java +++ b/Mage.Sets/src/mage/cards/g/GoblinAssassin.java @@ -68,7 +68,7 @@ class GoblinAssassinTriggeredEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null && !player.flipCoin(source, game, false)) { TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(player.getId(), source, game)) { player.chooseTarget(Outcome.Sacrifice, target, source, game); perms.addAll(target.getTargets()); diff --git a/Mage.Sets/src/mage/cards/g/GoliathHatchery.java b/Mage.Sets/src/mage/cards/g/GoliathHatchery.java index 2192d8c8cc5..11f147e85a9 100644 --- a/Mage.Sets/src/mage/cards/g/GoliathHatchery.java +++ b/Mage.Sets/src/mage/cards/g/GoliathHatchery.java @@ -82,7 +82,7 @@ class GoliathHatcheryEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/g/GrabTheReins.java b/Mage.Sets/src/mage/cards/g/GrabTheReins.java index 48a2f834e80..a3656e13fb6 100644 --- a/Mage.Sets/src/mage/cards/g/GrabTheReins.java +++ b/Mage.Sets/src/mage/cards/g/GrabTheReins.java @@ -80,7 +80,7 @@ class GrabTheReinsEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { UUID controllerId = source.getControllerId(); Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); target.setTargetName("a creature to sacrifice"); if (!target.canChoose(controllerId, source, game)) { return false; diff --git a/Mage.Sets/src/mage/cards/g/GrappleWithThePast.java b/Mage.Sets/src/mage/cards/g/GrappleWithThePast.java index 50333867a55..fbb3184579a 100644 --- a/Mage.Sets/src/mage/cards/g/GrappleWithThePast.java +++ b/Mage.Sets/src/mage/cards/g/GrappleWithThePast.java @@ -71,7 +71,7 @@ class GrappleWithThePastEffect extends OneShotEffect { return false; } TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game) && controller.chooseUse(outcome, "Return a creature or land card from your graveyard to hand?", source, game) && controller.choose(Outcome.ReturnToHand, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/g/GraveBirthing.java b/Mage.Sets/src/mage/cards/g/GraveBirthing.java index a1686b8e114..7061b898e58 100644 --- a/Mage.Sets/src/mage/cards/g/GraveBirthing.java +++ b/Mage.Sets/src/mage/cards/g/GraveBirthing.java @@ -73,7 +73,7 @@ class GraveBirthingEffect extends OneShotEffect { Player opponent = game.getPlayer(getTargetPointer().getFirst(game, source)); if (opponent != null) { Target target = new TargetCardInYourGraveyard(); - target.setNotTarget(true); + target.withNotTarget(true); opponent.chooseTarget(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); opponent.moveCards(card, Zone.EXILED, source, game); diff --git a/Mage.Sets/src/mage/cards/g/GraveConsequences.java b/Mage.Sets/src/mage/cards/g/GraveConsequences.java index 7ecdae2a3d3..1fa43b36cfe 100644 --- a/Mage.Sets/src/mage/cards/g/GraveConsequences.java +++ b/Mage.Sets/src/mage/cards/g/GraveConsequences.java @@ -73,7 +73,7 @@ class GraveConsequencesEffect extends OneShotEffect { .collect(Collectors.toList()); for (Player player : players) { TargetCard target = new TargetCardInYourGraveyard(0, Integer.MAX_VALUE); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Cards cards = new CardsImpl(target.getTargets()); if (!cards.isEmpty()) { diff --git a/Mage.Sets/src/mage/cards/g/GraveEndeavor.java b/Mage.Sets/src/mage/cards/g/GraveEndeavor.java index 5835cbf62f5..09ca5be3ab9 100644 --- a/Mage.Sets/src/mage/cards/g/GraveEndeavor.java +++ b/Mage.Sets/src/mage/cards/g/GraveEndeavor.java @@ -81,7 +81,7 @@ class GraveEndeavorEffect extends OneShotEffect { } if (player.getGraveyard().count(StaticFilters.FILTER_CARD_CREATURE, game) > 0) { TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); if (target.getFirstTarget() != null) { new ReturnFromGraveyardToBattlefieldWithCounterTargetEffect( diff --git a/Mage.Sets/src/mage/cards/g/GraveExchange.java b/Mage.Sets/src/mage/cards/g/GraveExchange.java index cd1dc65f8fa..cd3ae60169a 100644 --- a/Mage.Sets/src/mage/cards/g/GraveExchange.java +++ b/Mage.Sets/src/mage/cards/g/GraveExchange.java @@ -69,7 +69,7 @@ class GraveExchangeEffect extends OneShotEffect { } Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(player.getId(), source, game) && player.choose(Outcome.Sacrifice, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/g/GravePact.java b/Mage.Sets/src/mage/cards/g/GravePact.java index c8472dbf537..e028e19be26 100644 --- a/Mage.Sets/src/mage/cards/g/GravePact.java +++ b/Mage.Sets/src/mage/cards/g/GravePact.java @@ -99,7 +99,7 @@ class GravePactEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null && !playerId.equals(source.getControllerId())) { TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(player.getId(), source, game)) { player.chooseTarget(Outcome.Sacrifice, target, source, game); perms.addAll(target.getTargets()); diff --git a/Mage.Sets/src/mage/cards/g/GraveyardShovel.java b/Mage.Sets/src/mage/cards/g/GraveyardShovel.java index a8aae6009bc..66315d81542 100644 --- a/Mage.Sets/src/mage/cards/g/GraveyardShovel.java +++ b/Mage.Sets/src/mage/cards/g/GraveyardShovel.java @@ -67,7 +67,7 @@ class GraveyardShovelEffect extends OneShotEffect { return false; } TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(); - target.setNotTarget(true); + target.withNotTarget(true); targetPlayer.chooseTarget(Outcome.Exile, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/g/GriftersBlade.java b/Mage.Sets/src/mage/cards/g/GriftersBlade.java index 6a26430c2f1..f5d8ebf3f21 100644 --- a/Mage.Sets/src/mage/cards/g/GriftersBlade.java +++ b/Mage.Sets/src/mage/cards/g/GriftersBlade.java @@ -79,7 +79,7 @@ class GriftersBladeChooseCreatureEffect extends OneShotEffect { MageObject mageObject = game.getPermanentEntering(source.getSourceId()); if (controller != null && mageObject != null) { TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(this.outcome, target, source, game)) { Permanent attachToCreature = game.getPermanent(target.getFirstTarget()); if (attachToCreature != null) { diff --git a/Mage.Sets/src/mage/cards/g/GruesomeMenagerie.java b/Mage.Sets/src/mage/cards/g/GruesomeMenagerie.java index 586f9b41fa6..e1f3d34da1f 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeMenagerie.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeMenagerie.java @@ -84,7 +84,7 @@ class GruesomeMenagerieEffect extends OneShotEffect { Cards cards = new CardsImpl(); Target target; target = new TargetCardInYourGraveyard(filter1); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { @@ -92,7 +92,7 @@ class GruesomeMenagerieEffect extends OneShotEffect { } } target = new TargetCardInYourGraveyard(filter2); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { @@ -100,7 +100,7 @@ class GruesomeMenagerieEffect extends OneShotEffect { } } target = new TargetCardInYourGraveyard(filter3); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/g/GuardDogs.java b/Mage.Sets/src/mage/cards/g/GuardDogs.java index bfb51e3aa2c..06866207051 100644 --- a/Mage.Sets/src/mage/cards/g/GuardDogs.java +++ b/Mage.Sets/src/mage/cards/g/GuardDogs.java @@ -68,7 +68,7 @@ class GuardDogsEffect extends PreventionEffectImpl { @Override public void init(Ability source, Game game) { this.controlledTarget = new TargetControlledPermanent(); - this.controlledTarget.setNotTarget(true); + this.controlledTarget.withNotTarget(true); this.controlledTarget.choose(Outcome.PreventDamage, source.getControllerId(), source.getSourceId(), source, game); super.init(source, game); } diff --git a/Mage.Sets/src/mage/cards/g/GusthasScepter.java b/Mage.Sets/src/mage/cards/g/GusthasScepter.java index 633ff738d4f..f08c6f3d7e3 100644 --- a/Mage.Sets/src/mage/cards/g/GusthasScepter.java +++ b/Mage.Sets/src/mage/cards/g/GusthasScepter.java @@ -116,7 +116,7 @@ class GusthasScepterReturnEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInExile(filter, CardUtil.getExileZoneId(game, source)); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/g/GyrudaDoomOfDepths.java b/Mage.Sets/src/mage/cards/g/GyrudaDoomOfDepths.java index 6fca384b50e..c6b479b47f1 100644 --- a/Mage.Sets/src/mage/cards/g/GyrudaDoomOfDepths.java +++ b/Mage.Sets/src/mage/cards/g/GyrudaDoomOfDepths.java @@ -116,7 +116,7 @@ class GyrudaDoomOfDepthsEffect extends OneShotEffect { } // the creature card chosen can be in any zone, not just the graveyard TargetCard targetCard = new TargetCard(0, 1, Zone.ALL, filter); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); controller.choose(outcome, cards, targetCard, source, game); Card card = game.getCard(targetCard.getFirstTarget()); return card != null diff --git a/Mage.Sets/src/mage/cards/h/HandOfVecna.java b/Mage.Sets/src/mage/cards/h/HandOfVecna.java index 3b760f547d7..4010deea503 100644 --- a/Mage.Sets/src/mage/cards/h/HandOfVecna.java +++ b/Mage.Sets/src/mage/cards/h/HandOfVecna.java @@ -119,7 +119,7 @@ class HandOfVecnaEffect extends OneShotEffect { .collect(Collectors.toList()) )); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); toBoost = game.getPermanent(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/h/HansEriksson.java b/Mage.Sets/src/mage/cards/h/HansEriksson.java index e9ce7d32d61..b89a7d5ea46 100644 --- a/Mage.Sets/src/mage/cards/h/HansEriksson.java +++ b/Mage.Sets/src/mage/cards/h/HansEriksson.java @@ -106,7 +106,7 @@ class HansErikssonEffect extends OneShotEffect { filter.getPlayerFilter().add(new PlayerIdPredicate(defendingPlayerId)); filter.getPermanentFilter().add(new ControllerIdPredicate(defendingPlayerId)); TargetPlayerOrPlaneswalker target = new TargetPlayerOrPlaneswalker(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); defenderId = target.getFirstTarget(); } diff --git a/Mage.Sets/src/mage/cards/h/HarvestWurm.java b/Mage.Sets/src/mage/cards/h/HarvestWurm.java index ef7d83b9084..a283b631de9 100644 --- a/Mage.Sets/src/mage/cards/h/HarvestWurm.java +++ b/Mage.Sets/src/mage/cards/h/HarvestWurm.java @@ -28,7 +28,7 @@ public final class HarvestWurm extends CardImpl { // When Harvest Wurm enters the battlefield, sacrifice it unless you return a basic land card from your graveyard to your hand. TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_BASIC_LAND_A); - target.setNotTarget(true); + target.withNotTarget(true); this.addAbility(new EntersBattlefieldTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ReturnToHandFromGraveyardCost(target)))); } diff --git a/Mage.Sets/src/mage/cards/h/HatchetBully.java b/Mage.Sets/src/mage/cards/h/HatchetBully.java index 1ee026f962a..329609bdb5e 100644 --- a/Mage.Sets/src/mage/cards/h/HatchetBully.java +++ b/Mage.Sets/src/mage/cards/h/HatchetBully.java @@ -43,7 +43,7 @@ public final class HatchetBully extends CardImpl { ability.addCost(new HatchetBullyCost()); ability.addTarget(new TargetAnyTarget()); Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); ability.addTarget(target); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/h/HauntedFengraf.java b/Mage.Sets/src/mage/cards/h/HauntedFengraf.java index 13664894eb5..dc84d9b0418 100644 --- a/Mage.Sets/src/mage/cards/h/HauntedFengraf.java +++ b/Mage.Sets/src/mage/cards/h/HauntedFengraf.java @@ -71,7 +71,7 @@ class HauntedFengrafEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); target.setRandom(true); target.chooseTarget(outcome, player.getId(), source, game); return player.moveCards(game.getCard(target.getFirstTarget()), Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/h/HellkiteCourser.java b/Mage.Sets/src/mage/cards/h/HellkiteCourser.java index 1a67fd84e3b..9edad9883b4 100644 --- a/Mage.Sets/src/mage/cards/h/HellkiteCourser.java +++ b/Mage.Sets/src/mage/cards/h/HellkiteCourser.java @@ -83,7 +83,7 @@ class HellkiteCourserEffect extends OneShotEffect { return false; } TargetCard target = new TargetCard(0, 1, Zone.COMMAND, filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/h/HelmOfObedience.java b/Mage.Sets/src/mage/cards/h/HelmOfObedience.java index 04b7c80c17a..c05d21ef075 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfObedience.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfObedience.java @@ -95,7 +95,7 @@ class HelmOfObedienceEffect extends OneShotEffect { break; default: TargetCardInGraveyard target = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(Outcome.PutCreatureInPlay, cards, target, source, game); card = game.getCard(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/h/HighcliffFelidar.java b/Mage.Sets/src/mage/cards/h/HighcliffFelidar.java index 2c5298546d1..c49301426b1 100644 --- a/Mage.Sets/src/mage/cards/h/HighcliffFelidar.java +++ b/Mage.Sets/src/mage/cards/h/HighcliffFelidar.java @@ -100,7 +100,7 @@ class HighcliffFelidarEffect extends OneShotEffect { filter.add(new ControllerIdPredicate(opponent.getId())); filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, maxPower)); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(outcome, target, source, game)) { toDestroy.add(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/h/Humiliate.java b/Mage.Sets/src/mage/cards/h/Humiliate.java index 04b749c6ae0..5b6d9bbf10d 100644 --- a/Mage.Sets/src/mage/cards/h/Humiliate.java +++ b/Mage.Sets/src/mage/cards/h/Humiliate.java @@ -70,7 +70,7 @@ class HumiliateEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); target.withChooseHint("+1/+1 counter"); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/h/HuntedNightmare.java b/Mage.Sets/src/mage/cards/h/HuntedNightmare.java index 726a64e530e..36d279904cb 100644 --- a/Mage.Sets/src/mage/cards/h/HuntedNightmare.java +++ b/Mage.Sets/src/mage/cards/h/HuntedNightmare.java @@ -77,7 +77,7 @@ class HuntedNightmareEffect extends OneShotEffect { return false; } Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); return permanent != null && permanent.addCounters(CounterType.DEATHTOUCH.createInstance(), player.getId(), source, game); diff --git a/Mage.Sets/src/mage/cards/i/IceCauldron.java b/Mage.Sets/src/mage/cards/i/IceCauldron.java index 76627f7a39e..0a34942a97a 100644 --- a/Mage.Sets/src/mage/cards/i/IceCauldron.java +++ b/Mage.Sets/src/mage/cards/i/IceCauldron.java @@ -96,7 +96,7 @@ class IceCauldronExileEffect extends OneShotEffect { return true; } TargetCard target = new TargetCard(Zone.HAND, filter); - target.setNotTarget(true); + target.withNotTarget(true); Card chosenCard = null; if (controller.choose(Outcome.Benefit, target, source, game)) { chosenCard = controller.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/i/ImmortalCoil.java b/Mage.Sets/src/mage/cards/i/ImmortalCoil.java index 6f9cb5623c7..216d6dc824c 100644 --- a/Mage.Sets/src/mage/cards/i/ImmortalCoil.java +++ b/Mage.Sets/src/mage/cards/i/ImmortalCoil.java @@ -117,7 +117,7 @@ class ImmortalCoilPreventionEffect extends PreventionEffectImpl { Player player = game.getPlayer(source.getControllerId()); if (player != null) { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(Math.min(damage, player.getGraveyard().size()), StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); player.moveCards(new CardsImpl(target.getTargets()), Zone.EXILED, source, game); } diff --git a/Mage.Sets/src/mage/cards/i/IncarnationTechnique.java b/Mage.Sets/src/mage/cards/i/IncarnationTechnique.java index 20cf455002f..25aec2b8e8e 100644 --- a/Mage.Sets/src/mage/cards/i/IncarnationTechnique.java +++ b/Mage.Sets/src/mage/cards/i/IncarnationTechnique.java @@ -66,7 +66,7 @@ class IncarnationTechniqueEffect extends OneShotEffect { } player.millCards(5, source, game); TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return true; } diff --git a/Mage.Sets/src/mage/cards/i/Incriminate.java b/Mage.Sets/src/mage/cards/i/Incriminate.java index d3fc5016275..efbe6765bf4 100644 --- a/Mage.Sets/src/mage/cards/i/Incriminate.java +++ b/Mage.Sets/src/mage/cards/i/Incriminate.java @@ -73,7 +73,7 @@ class IncriminateEffect extends OneShotEffect { } filter.add(mage.filter.predicate.Predicates.or(permanentIdPredicates)); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.chooseTarget(Outcome.Sacrifice, target, source, game); Permanent sacrificeCreature = game.getPermanent(target.getFirstTarget()); return sacrificeCreature != null diff --git a/Mage.Sets/src/mage/cards/i/IndustrialAdvancement.java b/Mage.Sets/src/mage/cards/i/IndustrialAdvancement.java index 79ed2672766..9120b88636a 100644 --- a/Mage.Sets/src/mage/cards/i/IndustrialAdvancement.java +++ b/Mage.Sets/src/mage/cards/i/IndustrialAdvancement.java @@ -71,7 +71,7 @@ class IndustrialAdvancementEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(0, 1); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null || !permanent.sacrifice(source, game)) { diff --git a/Mage.Sets/src/mage/cards/i/InfernalTutor.java b/Mage.Sets/src/mage/cards/i/InfernalTutor.java index 60e0bc23d20..94e0cd7ba9a 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalTutor.java +++ b/Mage.Sets/src/mage/cards/i/InfernalTutor.java @@ -79,7 +79,7 @@ class InfernalTutorEffect extends OneShotEffect { Card cardToReveal = null; if (controller.getHand().size() > 1) { Target target = new TargetCardInHand(StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.chooseTarget(outcome, target, source, game)) { cardToReveal = game.getCard(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/i/InnocentTraveler.java b/Mage.Sets/src/mage/cards/i/InnocentTraveler.java index aa66ac6579a..89a52993e52 100644 --- a/Mage.Sets/src/mage/cards/i/InnocentTraveler.java +++ b/Mage.Sets/src/mage/cards/i/InnocentTraveler.java @@ -78,7 +78,7 @@ class InnocentTravelerEffect extends OneShotEffect { } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(opponent.getId(), source, game) || !opponent.chooseUse(Outcome.AIDontUseIt, "Sacrifice a creature?", source, game) || !opponent.choose(Outcome.Sacrifice, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/i/InterventionPact.java b/Mage.Sets/src/mage/cards/i/InterventionPact.java index 0859537e705..24cbbf7a92a 100644 --- a/Mage.Sets/src/mage/cards/i/InterventionPact.java +++ b/Mage.Sets/src/mage/cards/i/InterventionPact.java @@ -70,7 +70,7 @@ class InterventionPactEffect extends OneShotEffect { if (controller != null) { Target target = new TargetSource(); target.setRequired(true); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.chooseTarget(outcome, target, source, game)) { ContinuousEffect continuousEffect = new InterventionPactPreventDamageEffect(); continuousEffect.setTargetPointer(new FixedTarget(target.getFirstTarget(), game)); diff --git a/Mage.Sets/src/mage/cards/i/InvasionOfAlara.java b/Mage.Sets/src/mage/cards/i/InvasionOfAlara.java index 5788cfee4e2..fd2160e9b63 100644 --- a/Mage.Sets/src/mage/cards/i/InvasionOfAlara.java +++ b/Mage.Sets/src/mage/cards/i/InvasionOfAlara.java @@ -90,7 +90,7 @@ class InvasionOfAlaraEffect extends OneShotEffect { castable.retainZone(Zone.EXILED, game); if (castable.size() > 1) { TargetCard target = new TargetCardInExile(StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, castable, target, source, game); player.moveCards(game.getCard(target.getFirstTarget()), Zone.HAND, source, game); } else { diff --git a/Mage.Sets/src/mage/cards/i/InventiveIteration.java b/Mage.Sets/src/mage/cards/i/InventiveIteration.java index cde84af6097..01b9469198f 100644 --- a/Mage.Sets/src/mage/cards/i/InventiveIteration.java +++ b/Mage.Sets/src/mage/cards/i/InventiveIteration.java @@ -94,7 +94,7 @@ class InventiveIterationEffect extends OneShotEffect { break; default: TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_ARTIFACT); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, player.getGraveyard(), target, source, game); card = game.getCard(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/i/InvokeDespair.java b/Mage.Sets/src/mage/cards/i/InvokeDespair.java index 99ca02842ac..029691f265c 100644 --- a/Mage.Sets/src/mage/cards/i/InvokeDespair.java +++ b/Mage.Sets/src/mage/cards/i/InvokeDespair.java @@ -68,7 +68,7 @@ class InvokeDespairEffect extends OneShotEffect { return false; } Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); opponent.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); boolean sacrificed = false; @@ -80,7 +80,7 @@ class InvokeDespairEffect extends OneShotEffect { controller.drawCards(1, source, game); } target = new TargetControlledPermanent(enchantmentFilter); - target.setNotTarget(true); + target.withNotTarget(true); opponent.choose(outcome, target, source, game); permanent = game.getPermanent(target.getFirstTarget()); sacrificed = false; @@ -92,7 +92,7 @@ class InvokeDespairEffect extends OneShotEffect { controller.drawCards(1, source, game); } target = new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_PLANESWALKER); - target.setNotTarget(true); + target.withNotTarget(true); opponent.choose(outcome, target, source, game); permanent = game.getPermanent(target.getFirstTarget()); sacrificed = false; diff --git a/Mage.Sets/src/mage/cards/i/InvokeJustice.java b/Mage.Sets/src/mage/cards/i/InvokeJustice.java index aacd8246a8f..94963da2955 100644 --- a/Mage.Sets/src/mage/cards/i/InvokeJustice.java +++ b/Mage.Sets/src/mage/cards/i/InvokeJustice.java @@ -88,7 +88,7 @@ class InvokeJusticeEffect extends OneShotEffect { } // todo: the pop-up window for assigning the amount of counters uses the damage GUI. it should have its own GUI for assigning counters TargetAmount target = new TargetCreaturePermanentAmount(4, filter); - target.setNotTarget(true); + target.withNotTarget(true); // note, when using TargetAmount, the target must be used to embed the chosen creatures in this case target.chooseTarget(outcome, player.getId(), source, game); for (UUID targetId : target.getTargets()) { diff --git a/Mage.Sets/src/mage/cards/j/JarJarBinks.java b/Mage.Sets/src/mage/cards/j/JarJarBinks.java index f11fc6e6951..4716de25dc1 100644 --- a/Mage.Sets/src/mage/cards/j/JarJarBinks.java +++ b/Mage.Sets/src/mage/cards/j/JarJarBinks.java @@ -155,7 +155,7 @@ class JarJarBinksTapEffect extends OneShotEffect { FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("one of the creatures with the highest power"); filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, highestPower)); Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game)) { if (controller.choose(outcome, target, source, game)) { permanentToTap = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/j/JestersScepter.java b/Mage.Sets/src/mage/cards/j/JestersScepter.java index 1a22bad79bc..21a6e966739 100644 --- a/Mage.Sets/src/mage/cards/j/JestersScepter.java +++ b/Mage.Sets/src/mage/cards/j/JestersScepter.java @@ -154,7 +154,7 @@ class JestersScepterCost extends CostImpl { Player controller = game.getPlayer(controllerId); if (controller != null) { TargetCardInExile target = new TargetCardInExile(new FilterCard(), CardUtil.getCardExileZoneId(game, ability)); - target.setNotTarget(true); + target.withNotTarget(true); Cards cards = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, ability)); if (cards != null && !cards.isEmpty() diff --git a/Mage.Sets/src/mage/cards/j/JourneyToTheLostCity.java b/Mage.Sets/src/mage/cards/j/JourneyToTheLostCity.java index 3148def803d..d5b6ef60be6 100644 --- a/Mage.Sets/src/mage/cards/j/JourneyToTheLostCity.java +++ b/Mage.Sets/src/mage/cards/j/JourneyToTheLostCity.java @@ -95,7 +95,7 @@ class JourneyToTheLostCityEffect extends RollDieWithResultTableEffect { } if (amount <= 9) { TargetCard target = new TargetCardInExile(0, 1, StaticFilters.FILTER_CARD_LAND, null); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, cards, target, source, game); Card card = game.getCard(target.getFirstTarget()); return card != null && player.moveCards(card, Zone.BATTLEFIELD, source, game); diff --git a/Mage.Sets/src/mage/cards/k/KairiTheSwirlingSky.java b/Mage.Sets/src/mage/cards/k/KairiTheSwirlingSky.java index cd1880501e6..7af12a0b7d5 100644 --- a/Mage.Sets/src/mage/cards/k/KairiTheSwirlingSky.java +++ b/Mage.Sets/src/mage/cards/k/KairiTheSwirlingSky.java @@ -132,7 +132,7 @@ class KairiTheSwirlingSkyEffect extends OneShotEffect { TargetCard target = new TargetCardInGraveyard( 0, 2, StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY ); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, player.getGraveyard(), target, source, game); return player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); } diff --git a/Mage.Sets/src/mage/cards/k/KamahlsDruidicVow.java b/Mage.Sets/src/mage/cards/k/KamahlsDruidicVow.java index d21035aed9b..11c3b174779 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlsDruidicVow.java +++ b/Mage.Sets/src/mage/cards/k/KamahlsDruidicVow.java @@ -79,7 +79,7 @@ class KamahlsDruidicVowEffect extends OneShotEffect { SuperType.LEGENDARY.getPredicate() )); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.LIBRARY, filter); - target1.setNotTarget(true); + target1.withNotTarget(true); controller.choose(Outcome.PutCardInPlay, cards, target1, source, game); Cards toBattlefield = new CardsImpl(target1.getTargets()); cards.removeAll(toBattlefield); diff --git a/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java b/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java index a36d56f3482..1d4b6f9d551 100644 --- a/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java +++ b/Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java @@ -105,7 +105,7 @@ class KamizDoubleStrikeEffect extends OneShotEffect { filter.add(Predicates.not(new PermanentIdPredicate(permanent.getId()))); filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, permanent.getPower().getValue())); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.choose(outcome, source.getControllerId(), source.getSourceId(), source, game)) { game.addEffect( new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance()) diff --git a/Mage.Sets/src/mage/cards/k/KarnScionOfUrza.java b/Mage.Sets/src/mage/cards/k/KarnScionOfUrza.java index ab5ec633adb..e825da2fab5 100644 --- a/Mage.Sets/src/mage/cards/k/KarnScionOfUrza.java +++ b/Mage.Sets/src/mage/cards/k/KarnScionOfUrza.java @@ -166,7 +166,7 @@ class KarnMinus1Effect extends OneShotEffect { break; default: TargetCard target = new TargetCardInExile(filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); card = cards.get(target.getFirstTarget(), game); } diff --git a/Mage.Sets/src/mage/cards/k/KathrilAspectWarper.java b/Mage.Sets/src/mage/cards/k/KathrilAspectWarper.java index af7a9258a00..5d85a6eea24 100644 --- a/Mage.Sets/src/mage/cards/k/KathrilAspectWarper.java +++ b/Mage.Sets/src/mage/cards/k/KathrilAspectWarper.java @@ -101,7 +101,7 @@ class KathrilAspectWarperEffect extends OneShotEffect { FilterControlledPermanent filter = new FilterControlledCreaturePermanent("creature to give a " + counterType + " counter"); Target target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, target, source, game)) { continue; } diff --git a/Mage.Sets/src/mage/cards/k/KaylasCommand.java b/Mage.Sets/src/mage/cards/k/KaylasCommand.java index 714bcd0d988..1fe9320c6dc 100644 --- a/Mage.Sets/src/mage/cards/k/KaylasCommand.java +++ b/Mage.Sets/src/mage/cards/k/KaylasCommand.java @@ -96,7 +96,7 @@ class KaylasCommandCounterEffect extends OneShotEffect { return false; } TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/k/KhalniGem.java b/Mage.Sets/src/mage/cards/k/KhalniGem.java index 6e27ee769ca..d85a086f66b 100644 --- a/Mage.Sets/src/mage/cards/k/KhalniGem.java +++ b/Mage.Sets/src/mage/cards/k/KhalniGem.java @@ -72,7 +72,7 @@ class KhalniGemReturnToHandTargetEffect extends OneShotEffect { TargetPermanent target = new TargetPermanent( Math.min(landCount, 2), StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND ); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); return player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); } diff --git a/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java b/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java index 07c992f9342..2688f929183 100644 --- a/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java +++ b/Mage.Sets/src/mage/cards/k/KianneDeanOfSubstance.java @@ -212,7 +212,7 @@ class ImbrahamDeanOfTheoryEffect extends OneShotEffect { card.addCounters(CounterType.STUDY.createInstance(), source.getControllerId(), source, game); } TargetCard targetCard = new TargetCardInExile(0, 1, filter, null); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); player.choose(outcome, targetCard, source, game); Card card = game.getCard(targetCard.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/k/KingNarfisBetrayal.java b/Mage.Sets/src/mage/cards/k/KingNarfisBetrayal.java index c621862a997..3bcdd5047c3 100644 --- a/Mage.Sets/src/mage/cards/k/KingNarfisBetrayal.java +++ b/Mage.Sets/src/mage/cards/k/KingNarfisBetrayal.java @@ -94,7 +94,7 @@ class KingNarfisBetrayalFirstEffect extends OneShotEffect { if (controller.getGraveyard().count(filter, game) != 0) { if (controller.chooseUse(outcome, "Exile a creature or planeswalker card from your graveyard?", source, game)) { TargetCard target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.chooseTarget(outcome, controller.getGraveyard(), target, source, game)) { controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, null)); } @@ -111,7 +111,7 @@ class KingNarfisBetrayalFirstEffect extends OneShotEffect { if (opponent.getGraveyard().count(filter, game) != 0) { if (controller.chooseUse(outcome, "Exile a creature or planeswalker card from " + opponent.getName() + "'s graveyard?", source, game)) { TargetCard target = new TargetCardInOpponentsGraveyard(1, 1, filter, true); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.chooseTarget(outcome, opponent.getGraveyard(), target, source, game)) { controller.moveCardsToExile(game.getCard(target.getFirstTarget()), source, game, true, CardUtil.getCardExileZoneId(game, source), CardUtil.createObjectRealtedWindowTitle(source, game, null)); } diff --git a/Mage.Sets/src/mage/cards/k/KnowledgePool.java b/Mage.Sets/src/mage/cards/k/KnowledgePool.java index 770f2560dea..e2977299e4c 100644 --- a/Mage.Sets/src/mage/cards/k/KnowledgePool.java +++ b/Mage.Sets/src/mage/cards/k/KnowledgePool.java @@ -168,7 +168,7 @@ class KnowledgePoolExileAndPlayEffect extends OneShotEffect { filter.add(Predicates.not(new CardIdPredicate(spell.getSourceId()))); TargetCardInExile target = new TargetCardInExile(0, 1, filter, source.getSourceId()); - target.setNotTarget(true); + target.withNotTarget(true); if (!spellController.choose(Outcome.PlayForFree, game.getExile().getExileZone(exileZoneId), target, source, game)) { // Player chose to not cast any ofthe spells diff --git a/Mage.Sets/src/mage/cards/k/Kudzu.java b/Mage.Sets/src/mage/cards/k/Kudzu.java index ca63fd065b5..598de1294cb 100644 --- a/Mage.Sets/src/mage/cards/k/Kudzu.java +++ b/Mage.Sets/src/mage/cards/k/Kudzu.java @@ -83,7 +83,7 @@ class KudzuEffect extends OneShotEffect { } if (!game.getBattlefield().getAllActivePermanents(CardType.LAND, game).isEmpty()) { //lands are available on the battlefield Target target = new TargetLandPermanent(); - target.setNotTarget(true); //not a target, it is chosen + target.withNotTarget(true); //not a target, it is chosen Card kudzuCard = game.getCard(source.getSourceId()); if (kudzuCard != null && landsController != null) { if (landsController.choose(Outcome.Detriment, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/l/LazotepConvert.java b/Mage.Sets/src/mage/cards/l/LazotepConvert.java index 26ff6fcc8e0..cdc4853098d 100644 --- a/Mage.Sets/src/mage/cards/l/LazotepConvert.java +++ b/Mage.Sets/src/mage/cards/l/LazotepConvert.java @@ -87,7 +87,7 @@ class LazotepConvertCopyEffect extends OneShotEffect { return false; } Target target = new TargetCardInGraveyard(0, 1, filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Card copyFromCard = game.getCard(target.getFirstTarget()); if (copyFromCard == null) { diff --git a/Mage.Sets/src/mage/cards/l/LethalSting.java b/Mage.Sets/src/mage/cards/l/LethalSting.java index 7be1514b68e..eaee359b64c 100644 --- a/Mage.Sets/src/mage/cards/l/LethalSting.java +++ b/Mage.Sets/src/mage/cards/l/LethalSting.java @@ -69,7 +69,7 @@ class LethalStingCost extends CostImpl { Player controller = game.getPlayer(ability.getControllerId()); if (controller != null) { Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(Outcome.UnboostCreature, target, ability, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java b/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java index 0de63220f9b..c15e316e826 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java +++ b/Mage.Sets/src/mage/cards/l/LilianaDreadhordeGeneral.java @@ -100,7 +100,7 @@ class LilianaDreadhordeGeneralEffect extends OneShotEffect { ); filter.add(cardType.getPredicate()); Target target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (opponent.choose(outcome, target, source, game)) { keepFilter.add(Predicates.not(new CardIdPredicate(target.getFirstTarget()))); } diff --git a/Mage.Sets/src/mage/cards/l/LilianaTheLastHope.java b/Mage.Sets/src/mage/cards/l/LilianaTheLastHope.java index 1033b1b75fe..deb0cc58485 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaTheLastHope.java +++ b/Mage.Sets/src/mage/cards/l/LilianaTheLastHope.java @@ -88,7 +88,7 @@ class LilianaTheLastHopeEffect extends OneShotEffect { return false; } TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game) && controller.chooseUse(outcome, "Return a creature card from your graveyard to hand?", source, game) && controller.choose(Outcome.ReturnToHand, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/l/LilianaTheNecromancer.java b/Mage.Sets/src/mage/cards/l/LilianaTheNecromancer.java index f58dadf787f..10e768d736b 100644 --- a/Mage.Sets/src/mage/cards/l/LilianaTheNecromancer.java +++ b/Mage.Sets/src/mage/cards/l/LilianaTheNecromancer.java @@ -84,7 +84,7 @@ class LilianaTheNecromancerEffect extends OneShotEffect { return false; } Target target = new TargetCardInGraveyard(0, 2, filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/l/LimitedResources.java b/Mage.Sets/src/mage/cards/l/LimitedResources.java index bf52fc1b5d4..021d130b24b 100644 --- a/Mage.Sets/src/mage/cards/l/LimitedResources.java +++ b/Mage.Sets/src/mage/cards/l/LimitedResources.java @@ -78,7 +78,7 @@ class LimitedResourcesEffect extends OneShotEffect { if (player != null) { int lands = game.getBattlefield().countAll(new FilterControlledLandPermanent(), playerId, game); TargetLandPermanent target = new TargetLandPermanent(Integer.min(5, lands)); - target.setNotTarget(true); + target.withNotTarget(true); target.setRequired(true); player.chooseTarget(outcome.Benefit, target, source, game); game.getBattlefield().getAllActivePermanents(new FilterControlledLandPermanent(), playerId, game).stream().filter((land) -> (!target.getTargets().contains(land.getId()))).forEachOrdered((land) -> { diff --git a/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java b/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java index c51021e7ab3..bc770a5f8c5 100644 --- a/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java +++ b/Mage.Sets/src/mage/cards/l/LinessaZephyrMage.java @@ -96,7 +96,7 @@ class LinessaZephyrMageEffect extends OneShotEffect { if (targetPlayer != null) { // Target player returns a creature they control to its owner's hand, Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (target.choose(Outcome.ReturnToHand, targetPlayer.getId(), source.getSourceId(), source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { @@ -108,7 +108,7 @@ class LinessaZephyrMageEffect extends OneShotEffect { FilterControlledPermanent filter = new FilterControlledPermanent("artifact you control"); filter.add(CardType.ARTIFACT.getPredicate()); target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.choose(Outcome.ReturnToHand, targetPlayer.getId(), source.getSourceId(), source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { @@ -120,7 +120,7 @@ class LinessaZephyrMageEffect extends OneShotEffect { filter = new FilterControlledPermanent("enchantment you control"); filter.add(CardType.ENCHANTMENT.getPredicate()); target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.choose(Outcome.ReturnToHand, targetPlayer.getId(), source.getSourceId(), source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { @@ -132,7 +132,7 @@ class LinessaZephyrMageEffect extends OneShotEffect { filter = new FilterControlledPermanent("land you control"); filter.add(CardType.LAND.getPredicate()); target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.choose(Outcome.ReturnToHand, targetPlayer.getId(), source.getSourceId(), source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/l/LivingLore.java b/Mage.Sets/src/mage/cards/l/LivingLore.java index 9221ba025a1..3da38af83b6 100644 --- a/Mage.Sets/src/mage/cards/l/LivingLore.java +++ b/Mage.Sets/src/mage/cards/l/LivingLore.java @@ -91,7 +91,7 @@ class LivingLoreExileEffect extends OneShotEffect { TargetCard target = new TargetCardInYourGraveyard( StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY_FROM_YOUR_GRAVEYARD ); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/l/Lobotomy.java b/Mage.Sets/src/mage/cards/l/Lobotomy.java index 3d339fcb3c7..0b372f7494a 100644 --- a/Mage.Sets/src/mage/cards/l/Lobotomy.java +++ b/Mage.Sets/src/mage/cards/l/Lobotomy.java @@ -72,7 +72,7 @@ class LobotomyEffect extends OneShotEffect { // You choose card other than a basic land card TargetCard target = new TargetCard(Zone.HAND, filter); - target.setNotTarget(true); + target.withNotTarget(true); Card chosenCard = null; if (controller.chooseTarget(Outcome.Benefit, targetPlayer.getHand(), target, source, game)) { chosenCard = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/l/LordXanderTheCollector.java b/Mage.Sets/src/mage/cards/l/LordXanderTheCollector.java index bd2ef367b80..e8e736f6c02 100644 --- a/Mage.Sets/src/mage/cards/l/LordXanderTheCollector.java +++ b/Mage.Sets/src/mage/cards/l/LordXanderTheCollector.java @@ -129,7 +129,7 @@ class LordXanderTheCollectorEffect extends OneShotEffect { TargetPermanent target = new TargetPermanent( count / 2, StaticFilters.FILTER_CONTROLLED_PERMANENT_NON_LAND ); - target.setNotTarget(true); + target.withNotTarget(true); target.withChooseHint("sacrifice"); target.setRequired(true); player.choose(outcome, target, source, game); diff --git a/Mage.Sets/src/mage/cards/l/LyndeCheerfulTormentor.java b/Mage.Sets/src/mage/cards/l/LyndeCheerfulTormentor.java index f2497c56130..872049e3fb5 100644 --- a/Mage.Sets/src/mage/cards/l/LyndeCheerfulTormentor.java +++ b/Mage.Sets/src/mage/cards/l/LyndeCheerfulTormentor.java @@ -166,7 +166,7 @@ class LyndeCheerfulTormentorAttachCurseEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { TargetPermanent targetPermanent = new TargetPermanent(filter); - targetPermanent.setNotTarget(true); + targetPermanent.withNotTarget(true); if (controller.chooseTarget(outcome, targetPermanent, source, game)) { Permanent curse = game.getPermanent(targetPermanent.getFirstTarget()); if (curse != null) { diff --git a/Mage.Sets/src/mage/cards/m/MakeAWish.java b/Mage.Sets/src/mage/cards/m/MakeAWish.java index 6f6ac29406c..e14d7a4f0a8 100644 --- a/Mage.Sets/src/mage/cards/m/MakeAWish.java +++ b/Mage.Sets/src/mage/cards/m/MakeAWish.java @@ -61,7 +61,7 @@ class MakeAWishEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(Math.min(player.getGraveyard().size(), 2), StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); target.setRandom(true); target.chooseTarget(outcome, player.getId(), source, game); return player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/m/MalikGrimManipulator.java b/Mage.Sets/src/mage/cards/m/MalikGrimManipulator.java index dcaafccaeb0..acdeffa60a7 100644 --- a/Mage.Sets/src/mage/cards/m/MalikGrimManipulator.java +++ b/Mage.Sets/src/mage/cards/m/MalikGrimManipulator.java @@ -86,7 +86,7 @@ class NeganTheColdBloodedEffect extends OneShotEffect { FilterPermanent filter = new FilterCreaturePermanent("creature controlled by " + opponent.getName()); filter.add(new ControllerIdPredicate(opponent.getId())); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/m/ManaBreach.java b/Mage.Sets/src/mage/cards/m/ManaBreach.java index c9eea4fabdb..706a3921b9d 100644 --- a/Mage.Sets/src/mage/cards/m/ManaBreach.java +++ b/Mage.Sets/src/mage/cards/m/ManaBreach.java @@ -66,7 +66,7 @@ class ManaBreachEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); return player.moveCards(game.getPermanent(target.getFirstTarget()), Zone.HAND, source, game); } diff --git a/Mage.Sets/src/mage/cards/m/MemoryLeak.java b/Mage.Sets/src/mage/cards/m/MemoryLeak.java index b300749ff62..467e7acc2ca 100644 --- a/Mage.Sets/src/mage/cards/m/MemoryLeak.java +++ b/Mage.Sets/src/mage/cards/m/MemoryLeak.java @@ -77,12 +77,12 @@ class MemoryLeakEffect extends OneShotEffect { if (controller.chooseUse(outcome, "Exile a card from hand or graveyard?", null, "Hand", "Graveyard", source, game)) { FilterCard filter = new FilterNonlandCard("nonland card in " + opponent.getName() + "'s hand"); target = new TargetCard(Zone.HAND, filter); - target.setNotTarget(true); + target.withNotTarget(true); cards = opponent.getHand(); } else { FilterCard filter = new FilterNonlandCard("nonland card in " + opponent.getName() + "'s graveyard"); target = new TargetCard(Zone.GRAVEYARD, filter); - target.setNotTarget(true); + target.withNotTarget(true); cards = opponent.getGraveyard(); } if (controller.choose(outcome, cards, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java b/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java index da1bf49ec2d..171e91ea8c8 100644 --- a/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java +++ b/Mage.Sets/src/mage/cards/m/MerchantsDockhand.java @@ -92,7 +92,7 @@ class MerchantsDockhandEffect extends OneShotEffect { controller.lookAtCards(sourceObject.getIdName(), cards, game); TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put into your hand")); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.chooseTarget(Outcome.DrawCard, cards, target, source, game)) { Card card = cards.get(target.getFirstTarget(), game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java index 942d528016a..090511d2ed9 100644 --- a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java +++ b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java @@ -80,7 +80,7 @@ class ChooseACreature extends OneShotEffect { return false; } Target target = new TargetCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(controller.getId(), source, game)) { return true; } diff --git a/Mage.Sets/src/mage/cards/m/MinscBooTimelessHeroes.java b/Mage.Sets/src/mage/cards/m/MinscBooTimelessHeroes.java index 4a9e2790157..8396f21cc7d 100644 --- a/Mage.Sets/src/mage/cards/m/MinscBooTimelessHeroes.java +++ b/Mage.Sets/src/mage/cards/m/MinscBooTimelessHeroes.java @@ -121,7 +121,7 @@ class MinscBooTimelessHeroesEffect extends OneShotEffect { } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/m/MishrasResearchDesk.java b/Mage.Sets/src/mage/cards/m/MishrasResearchDesk.java index 585131a6124..9d6b8990138 100644 --- a/Mage.Sets/src/mage/cards/m/MishrasResearchDesk.java +++ b/Mage.Sets/src/mage/cards/m/MishrasResearchDesk.java @@ -85,7 +85,7 @@ class MishrasResearchDeskEffect extends OneShotEffect { break; default: TargetCard target = new TargetCardInExile(StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, cards, target, source, game); card = game.getCard(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/m/MizzixsMastery.java b/Mage.Sets/src/mage/cards/m/MizzixsMastery.java index 56ae466abf1..31186070625 100644 --- a/Mage.Sets/src/mage/cards/m/MizzixsMastery.java +++ b/Mage.Sets/src/mage/cards/m/MizzixsMastery.java @@ -91,7 +91,7 @@ class MizzixsMasteryOverloadEffect extends OneShotEffect { && !copiedCards.isEmpty()) { TargetCard targetCard = new TargetCard(0, 1, Zone.EXILED, new FilterCard("copied card to cast without paying its mana cost?")); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); if (controller.chooseTarget(Outcome.PlayForFree, copiedCards, targetCard, source, game)) { Card selectedCard = game.getCard(targetCard.getFirstTarget()); if (selectedCard != null diff --git a/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java b/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java index 83f710664c8..0a236768c18 100644 --- a/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java +++ b/Mage.Sets/src/mage/cards/m/MogisGodOfSlaughter.java @@ -84,7 +84,7 @@ class MogisGodOfSlaughterEffect extends OneShotEffect { return player.damage(2, source.getSourceId(), source, game) > 0; } TargetPermanent target = new TargetControlledCreaturePermanent(1); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(player.getId(), source, game) && player.chooseUse(Outcome.Detriment, "Sacrifice a creature to prevent 2 damage?", source, game) && player.choose(Outcome.Sacrifice, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/m/MountDoom.java b/Mage.Sets/src/mage/cards/m/MountDoom.java index 30fbb881bec..1a7119b1d3c 100644 --- a/Mage.Sets/src/mage/cards/m/MountDoom.java +++ b/Mage.Sets/src/mage/cards/m/MountDoom.java @@ -110,7 +110,7 @@ class MountDoomEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetCreaturePermanent(0, 2); - target.setNotTarget(true); + target.withNotTarget(true); target.withChooseHint("the rest will be destroyed"); player.choose(outcome, target, source, game); FilterPermanent filter = new FilterCreaturePermanent(); diff --git a/Mage.Sets/src/mage/cards/m/MultipleChoice.java b/Mage.Sets/src/mage/cards/m/MultipleChoice.java index ccf734e83aa..9d1db65134e 100644 --- a/Mage.Sets/src/mage/cards/m/MultipleChoice.java +++ b/Mage.Sets/src/mage/cards/m/MultipleChoice.java @@ -89,7 +89,7 @@ class MultipleChoiceEffect extends OneShotEffect { return true; } TargetPermanent targetPermanent = new TargetControlledCreaturePermanent(); - targetPermanent.setNotTarget(true); + targetPermanent.withNotTarget(true); player.choose(Outcome.ReturnToHand, targetPermanent, source, game); Permanent permanent = game.getPermanent(targetPermanent.getFirstTarget()); return permanent == null || player.moveCards(permanent, Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java b/Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java index a87c7ba1ea9..d50ad30e4be 100644 --- a/Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java +++ b/Mage.Sets/src/mage/cards/m/MythosOfSnapdax.java @@ -102,7 +102,7 @@ class MythosOfSnapdaxEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (conditionMet) { controller.choose(outcome, target, source, game); } else { diff --git a/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java b/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java index 05a2ece77d3..a3971466c9f 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java +++ b/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java @@ -126,12 +126,12 @@ class NahiriHeirOfTheAncientsEffect extends OneShotEffect { .collect(Collectors.toSet()) )); TargetPermanent target = new TargetPermanent(tokenFilter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); tokenCreature = game.getPermanent(target.getFirstTarget()); } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); tokenCreature.addAttachment(target.getFirstTarget(), source, game); return true; diff --git a/Mage.Sets/src/mage/cards/n/NecromanticSelection.java b/Mage.Sets/src/mage/cards/n/NecromanticSelection.java index f8220ff71b8..0bd359570da 100644 --- a/Mage.Sets/src/mage/cards/n/NecromanticSelection.java +++ b/Mage.Sets/src/mage/cards/n/NecromanticSelection.java @@ -90,7 +90,7 @@ class NecromanticSelectionEffect extends OneShotEffect { } filter.add(Predicates.or(cardIdPredicates)); Target target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.chooseTarget(Outcome.Benefit, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/n/NettlevineBlight.java b/Mage.Sets/src/mage/cards/n/NettlevineBlight.java index 599336ae48d..42f72e6b585 100644 --- a/Mage.Sets/src/mage/cards/n/NettlevineBlight.java +++ b/Mage.Sets/src/mage/cards/n/NettlevineBlight.java @@ -92,7 +92,7 @@ class NettlevineBlightEffect extends OneShotEffect { filter.add(new ControllerIdPredicate(newController.getId())); filter.add(new CanBeEnchantedByPredicate(nettlevineBlight)); Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(newController.getId(), source, game) && newController.choose(outcome, target, source, game)) { Permanent chosenPermanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/n/NeverHappened.java b/Mage.Sets/src/mage/cards/n/NeverHappened.java index f0930d6089e..15b1bbfd8db 100644 --- a/Mage.Sets/src/mage/cards/n/NeverHappened.java +++ b/Mage.Sets/src/mage/cards/n/NeverHappened.java @@ -72,12 +72,12 @@ class NeverHappenedEffect extends OneShotEffect { if (controller.chooseUse(outcome, "Exile a card from hand or graveyard?", null, "Hand", "Graveyard", source, game)) { FilterCard filter = new FilterNonlandCard("nonland card in " + opponent.getName() + "'s hand"); target = new TargetCard(Zone.HAND, filter); - target.setNotTarget(true); + target.withNotTarget(true); cards = opponent.getHand(); } else { FilterCard filter = new FilterNonlandCard("nonland card in " + opponent.getName() + "'s graveyard"); target = new TargetCard(Zone.GRAVEYARD, filter); - target.setNotTarget(true); + target.withNotTarget(true); cards = opponent.getGraveyard(); } if (controller.choose(outcome, cards, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/n/NicolBolasDragonGod.java b/Mage.Sets/src/mage/cards/n/NicolBolasDragonGod.java index 1a069c46500..ae152e3d98f 100644 --- a/Mage.Sets/src/mage/cards/n/NicolBolasDragonGod.java +++ b/Mage.Sets/src/mage/cards/n/NicolBolasDragonGod.java @@ -148,7 +148,7 @@ class NicolBolasDragonGodPlusOneEffect extends OneShotEffect { } // permanent TargetPermanent targetPermanent = new TargetControlledPermanent(); - targetPermanent.setNotTarget(true); + targetPermanent.withNotTarget(true); targetPermanent.setTargetController(opponentId); if (!targetPermanent.possibleTargets(opponentId, game).isEmpty()) { possibleTargetTypes.add(targetPermanent); diff --git a/Mage.Sets/src/mage/cards/n/NivmagusElemental.java b/Mage.Sets/src/mage/cards/n/NivmagusElemental.java index 566feaa6143..a24cba580b8 100644 --- a/Mage.Sets/src/mage/cards/n/NivmagusElemental.java +++ b/Mage.Sets/src/mage/cards/n/NivmagusElemental.java @@ -58,7 +58,7 @@ class NivmagusElementalCost extends CostImpl { NivmagusElementalCost() { super(); TargetSpell target = new TargetSpell(filter); - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); this.text = "Exile an instant or sorcery spell you control"; } diff --git a/Mage.Sets/src/mage/cards/n/NomadMythmaker.java b/Mage.Sets/src/mage/cards/n/NomadMythmaker.java index 8dcd87c3ac7..8e93f7a86c5 100644 --- a/Mage.Sets/src/mage/cards/n/NomadMythmaker.java +++ b/Mage.Sets/src/mage/cards/n/NomadMythmaker.java @@ -86,7 +86,7 @@ class NomadMythmakerEffect extends OneShotEffect { } FilterControlledCreaturePermanent FILTER = new FilterControlledCreaturePermanent("Choose a creature you control"); TargetControlledPermanent target = new TargetControlledPermanent(FILTER); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(Outcome.PutCardInPlay, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null diff --git a/Mage.Sets/src/mage/cards/n/NulltreadGargantuan.java b/Mage.Sets/src/mage/cards/n/NulltreadGargantuan.java index f391ad9f674..717b2e2f4a1 100644 --- a/Mage.Sets/src/mage/cards/n/NulltreadGargantuan.java +++ b/Mage.Sets/src/mage/cards/n/NulltreadGargantuan.java @@ -68,7 +68,7 @@ class NulltreadGargantuanEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); return permanent != null && player.putCardsOnTopOfLibrary(permanent, game, source, false); diff --git a/Mage.Sets/src/mage/cards/o/OKagachiMadeManifest.java b/Mage.Sets/src/mage/cards/o/OKagachiMadeManifest.java index b4cc5c8399d..d20338dc62a 100644 --- a/Mage.Sets/src/mage/cards/o/OKagachiMadeManifest.java +++ b/Mage.Sets/src/mage/cards/o/OKagachiMadeManifest.java @@ -103,7 +103,7 @@ class OKagachiMadeManifestEffect extends OneShotEffect { break; default: TargetCard target = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_A_NON_LAND); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.ReturnToHand, controller.getGraveyard(), target, source, game); card = game.getCard(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/o/OathOfGhouls.java b/Mage.Sets/src/mage/cards/o/OathOfGhouls.java index a9f968b077d..226ef711aba 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfGhouls.java +++ b/Mage.Sets/src/mage/cards/o/OathOfGhouls.java @@ -116,7 +116,7 @@ class OathOfGhoulsEffect extends OneShotEffect { FilterCard filter = new FilterCreatureCard("creature card"); filter.add(new OwnerIdPredicate(firstPlayer.getId())); Target target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(firstPlayer.getId(), source, game) && firstPlayer.chooseUse(outcome, "Return a creature card from your graveyard to your hand?", source, game) && firstPlayer.chooseTarget(Outcome.ReturnToHand, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java index 20da4106d98..15d9883acb0 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java +++ b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java @@ -113,7 +113,7 @@ class OathOfLimDulEffect extends OneShotEffect { if (amountDamage > 0 && controller != null) { TargetControlledPermanent target = new TargetControlledPermanent(0, numberOfControlledPermanents, filter, true); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(Outcome.Detriment, target, source, game)) { for (UUID targetPermanentId : target.getTargets()) { Permanent permanent = game.getPermanent(targetPermanentId); diff --git a/Mage.Sets/src/mage/cards/o/ObscuraConfluence.java b/Mage.Sets/src/mage/cards/o/ObscuraConfluence.java index 4c833e9d15c..df9d1fca1bd 100644 --- a/Mage.Sets/src/mage/cards/o/ObscuraConfluence.java +++ b/Mage.Sets/src/mage/cards/o/ObscuraConfluence.java @@ -109,7 +109,7 @@ class ObscuraConfluenceReturnEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); return player.moveCards(game.getCard(target.getFirstTarget()), Zone.HAND, source, game); } diff --git a/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java b/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java index 83486df6ff0..912bdff5417 100644 --- a/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java +++ b/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java @@ -110,7 +110,7 @@ class OldGrowthTrollReturnEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(outcome, target, source, game) && game.getPermanent(target.getFirstTarget()) != null) { game.getState().setValue("attachTo:" + source.getSourceId(), target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/o/OrderOfSuccession.java b/Mage.Sets/src/mage/cards/o/OrderOfSuccession.java index 3a6e7979ef9..485a3b1951d 100644 --- a/Mage.Sets/src/mage/cards/o/OrderOfSuccession.java +++ b/Mage.Sets/src/mage/cards/o/OrderOfSuccession.java @@ -99,7 +99,7 @@ class OrderOfSuccessionEffect extends OneShotEffect { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature controlled by " + nextPlayer.getLogName()); filter.add(new ControllerIdPredicate(nextPlayer.getId())); Target target = new TargetCreaturePermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(currentPlayer.getId(), source, game)) { if (currentPlayer.chooseTarget(outcome, target, source, game)) { playerCreature.put(currentPlayer.getId(), target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/o/OrvarTheAllForm.java b/Mage.Sets/src/mage/cards/o/OrvarTheAllForm.java index 06dc9cfb26b..607d71b74cc 100644 --- a/Mage.Sets/src/mage/cards/o/OrvarTheAllForm.java +++ b/Mage.Sets/src/mage/cards/o/OrvarTheAllForm.java @@ -154,7 +154,7 @@ class OrvarTheAllFormEffect extends OneShotEffect { filter.add(Predicates.or(predicates)); filter.add(Predicates.not(new MageObjectReferencePredicate(new MageObjectReference(source)))); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); return new CreateTokenCopyTargetEffect() .setTargetPointer(new FixedTarget(target.getFirstTarget(), game)) diff --git a/Mage.Sets/src/mage/cards/o/OutOfTheTombs.java b/Mage.Sets/src/mage/cards/o/OutOfTheTombs.java index 838fcf535b2..895cb3b6f70 100644 --- a/Mage.Sets/src/mage/cards/o/OutOfTheTombs.java +++ b/Mage.Sets/src/mage/cards/o/OutOfTheTombs.java @@ -77,7 +77,7 @@ class OutOfTheTombsReplacementEffect extends ReplacementEffectImpl { } boolean cardReturned = false; TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(player.getId(), source, game)) { if (target.choose(Outcome.PutCreatureInPlay, player.getId(), source.getSourceId(), source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PathOfTheSchemer.java b/Mage.Sets/src/mage/cards/p/PathOfTheSchemer.java index ee4aaff7ddc..6ede4861fd1 100644 --- a/Mage.Sets/src/mage/cards/p/PathOfTheSchemer.java +++ b/Mage.Sets/src/mage/cards/p/PathOfTheSchemer.java @@ -69,7 +69,7 @@ class PathOfTheSchemerEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/p/PerishTheThought.java b/Mage.Sets/src/mage/cards/p/PerishTheThought.java index f76156b5f84..f1dfb2aee4e 100644 --- a/Mage.Sets/src/mage/cards/p/PerishTheThought.java +++ b/Mage.Sets/src/mage/cards/p/PerishTheThought.java @@ -68,7 +68,7 @@ class PerishTheThoughtEffect extends OneShotEffect { Player you = game.getPlayer(source.getControllerId()); if (you != null) { TargetCard target = new TargetCard(Zone.HAND, filter); - target.setNotTarget(true); + target.withNotTarget(true); if (you.choose(Outcome.Neutral, targetOpponent.getHand(), target, source, game)) { Card chosenCard = targetOpponent.getHand().get(target.getFirstTarget(), game); if (chosenCard != null) { diff --git a/Mage.Sets/src/mage/cards/p/PlarggAndNassari.java b/Mage.Sets/src/mage/cards/p/PlarggAndNassari.java index 8368c512961..2fcfdef15b9 100644 --- a/Mage.Sets/src/mage/cards/p/PlarggAndNassari.java +++ b/Mage.Sets/src/mage/cards/p/PlarggAndNassari.java @@ -102,7 +102,7 @@ class PlarggAndNassariEffect extends OneShotEffect { Player opponent = getOpponent(controller, source, game); if (opponent != null) { TargetCard target = new TargetCardInExile(StaticFilters.FILTER_CARD_NON_LAND); - target.setNotTarget(true); + target.withNotTarget(true); opponent.choose(outcome, cards, target, source, game); cards.remove(game.getCard(target.getFirstTarget())); } diff --git a/Mage.Sets/src/mage/cards/p/PolymorphousRush.java b/Mage.Sets/src/mage/cards/p/PolymorphousRush.java index f2ef0db4d50..cc918c3c1b3 100644 --- a/Mage.Sets/src/mage/cards/p/PolymorphousRush.java +++ b/Mage.Sets/src/mage/cards/p/PolymorphousRush.java @@ -67,7 +67,7 @@ class PolymorphousRushCopyEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { Target target = new TargetCreaturePermanent(new FilterCreaturePermanent("")); - target.setNotTarget(true); + target.withNotTarget(true); target.setTargetName("a creature on the battlefield (creature to copy)"); if (target.canChoose(controller.getId(), source, game) && controller.chooseTarget(outcome, target, source, game)) { Permanent copyFromCreature = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PorphyryNodes.java b/Mage.Sets/src/mage/cards/p/PorphyryNodes.java index d336aa12db2..35c340475bd 100644 --- a/Mage.Sets/src/mage/cards/p/PorphyryNodes.java +++ b/Mage.Sets/src/mage/cards/p/PorphyryNodes.java @@ -92,7 +92,7 @@ class PorphyryNodesEffect extends OneShotEffect { FilterCreaturePermanent filter = new FilterCreaturePermanent("one of the creatures with the least power"); filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, leastPower)); Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game)) { if (controller.choose(outcome, target, source, game)) { permanentToDestroy = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/p/PortOfKarfell.java b/Mage.Sets/src/mage/cards/p/PortOfKarfell.java index 3f04b1d9830..2447c456cef 100644 --- a/Mage.Sets/src/mage/cards/p/PortOfKarfell.java +++ b/Mage.Sets/src/mage/cards/p/PortOfKarfell.java @@ -77,7 +77,7 @@ class PortOfKarfellEffect extends OneShotEffect { } player.millCards(4, source, game); TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return true; } diff --git a/Mage.Sets/src/mage/cards/p/PrimalEmpathy.java b/Mage.Sets/src/mage/cards/p/PrimalEmpathy.java index ce5744e1519..6067acb2ab3 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalEmpathy.java +++ b/Mage.Sets/src/mage/cards/p/PrimalEmpathy.java @@ -86,7 +86,7 @@ class PrimalEmpathyEffect extends OneShotEffect { return player.drawCards(1, source, game) > 0; } Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/p/PrimordialMist.java b/Mage.Sets/src/mage/cards/p/PrimordialMist.java index 6389384cd45..a48e5886ba0 100644 --- a/Mage.Sets/src/mage/cards/p/PrimordialMist.java +++ b/Mage.Sets/src/mage/cards/p/PrimordialMist.java @@ -45,7 +45,7 @@ public final class PrimordialMist extends CardImpl { // Exile a face-down permanent you control face-up: You may play that card this turn TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PrimordialMistCastFromExileEffect(), new PrimordialMistCost(target)); diff --git a/Mage.Sets/src/mage/cards/p/PromiseOfLoyalty.java b/Mage.Sets/src/mage/cards/p/PromiseOfLoyalty.java index 420715929dc..c76ccbbc8f8 100644 --- a/Mage.Sets/src/mage/cards/p/PromiseOfLoyalty.java +++ b/Mage.Sets/src/mage/cards/p/PromiseOfLoyalty.java @@ -72,7 +72,7 @@ class PromiseOfLoyaltyEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/p/ProtectiveSphere.java b/Mage.Sets/src/mage/cards/p/ProtectiveSphere.java index 6c97b32a48e..9d4c9e49ca6 100644 --- a/Mage.Sets/src/mage/cards/p/ProtectiveSphere.java +++ b/Mage.Sets/src/mage/cards/p/ProtectiveSphere.java @@ -75,7 +75,7 @@ class ProtectiveSphereEffect extends PreventionEffectImpl { @Override public void init(Ability source, Game game) { - target.setNotTarget(true); + target.withNotTarget(true); target.setRequired(false); Player controller = game.getPlayer(source.getControllerId()); Permanent protectiveSphere = game.getPermanent(source.getSourceId()); diff --git a/Mage.Sets/src/mage/cards/p/PryingQuestions.java b/Mage.Sets/src/mage/cards/p/PryingQuestions.java index daeeec470a8..9de62065391 100644 --- a/Mage.Sets/src/mage/cards/p/PryingQuestions.java +++ b/Mage.Sets/src/mage/cards/p/PryingQuestions.java @@ -62,7 +62,7 @@ class PryingQuestionsEffect extends OneShotEffect { if (targetOpponent != null) { if (!targetOpponent.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); - target.setNotTarget(true); + target.withNotTarget(true); target.setTargetName("a card from your hand to put on top of your library"); targetOpponent.choose(Outcome.Detriment, target, source, game); Card card = targetOpponent.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/p/PurgingScythe.java b/Mage.Sets/src/mage/cards/p/PurgingScythe.java index 6dffaf29749..d3f33aed4b2 100644 --- a/Mage.Sets/src/mage/cards/p/PurgingScythe.java +++ b/Mage.Sets/src/mage/cards/p/PurgingScythe.java @@ -84,7 +84,7 @@ class PurgingScytheEffect extends OneShotEffect { FilterCreaturePermanent filter = new FilterCreaturePermanent("one of the creatures with the least toughness"); filter.add(new ToughnessPredicate(ComparisonType.EQUAL_TO, leastToughness)); Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game)) { if (controller.choose(outcome, target, source, game)) { permanentToDamage = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/q/QueenKaylaBinKroog.java b/Mage.Sets/src/mage/cards/q/QueenKaylaBinKroog.java index 7e50121d720..ae49d30f05b 100644 --- a/Mage.Sets/src/mage/cards/q/QueenKaylaBinKroog.java +++ b/Mage.Sets/src/mage/cards/q/QueenKaylaBinKroog.java @@ -97,7 +97,7 @@ class QueenKaylaBinKroogTarget extends TargetCard { QueenKaylaBinKroogTarget() { super(0, 3, Zone.ALL, filter); - this.setNotTarget(true); + this.withNotTarget(true); } private QueenKaylaBinKroogTarget(final QueenKaylaBinKroogTarget target) { diff --git a/Mage.Sets/src/mage/cards/r/RadiantScrollwielder.java b/Mage.Sets/src/mage/cards/r/RadiantScrollwielder.java index de0c34dc7d9..f6c36343409 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantScrollwielder.java +++ b/Mage.Sets/src/mage/cards/r/RadiantScrollwielder.java @@ -95,7 +95,7 @@ class RadiantScrollwielderEffect extends OneShotEffect { return false; } TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY); - target.setNotTarget(true); + target.withNotTarget(true); target.setRandom(true); target.chooseTarget(outcome, player.getId(), source, game); Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/r/RagsRiches.java b/Mage.Sets/src/mage/cards/r/RagsRiches.java index 163b9a83552..a0df514573e 100644 --- a/Mage.Sets/src/mage/cards/r/RagsRiches.java +++ b/Mage.Sets/src/mage/cards/r/RagsRiches.java @@ -75,7 +75,7 @@ class RichesEffect extends OneShotEffect { Player opponent = game.getPlayer(playerId); if (opponent != null) { TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (opponent.choose(Outcome.Detriment, target, source, game)) { creaturesToSteal.add(target.getTargets().get(0)); } diff --git a/Mage.Sets/src/mage/cards/r/RampageOfTheValkyries.java b/Mage.Sets/src/mage/cards/r/RampageOfTheValkyries.java index bd5f0d149ab..3e4088341c1 100644 --- a/Mage.Sets/src/mage/cards/r/RampageOfTheValkyries.java +++ b/Mage.Sets/src/mage/cards/r/RampageOfTheValkyries.java @@ -76,7 +76,7 @@ class RampageOfTheValkyriesEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(playerId, source, game)) { continue; } diff --git a/Mage.Sets/src/mage/cards/r/RealmbreakerTheInvasionTree.java b/Mage.Sets/src/mage/cards/r/RealmbreakerTheInvasionTree.java index 36013951e7e..04d8fd42f16 100644 --- a/Mage.Sets/src/mage/cards/r/RealmbreakerTheInvasionTree.java +++ b/Mage.Sets/src/mage/cards/r/RealmbreakerTheInvasionTree.java @@ -98,7 +98,7 @@ class RealmbreakerTheInvasionTreeEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_LAND); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(Outcome.PutLandInPlay, opponent.getGraveyard(), target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/r/RealmsUncharted.java b/Mage.Sets/src/mage/cards/r/RealmsUncharted.java index 3de0b37c704..2b7e09fafd6 100644 --- a/Mage.Sets/src/mage/cards/r/RealmsUncharted.java +++ b/Mage.Sets/src/mage/cards/r/RealmsUncharted.java @@ -80,7 +80,7 @@ class RealmsUnchartedEffect extends OneShotEffect { if (cards.size() > 2) { TargetOpponent targetOpponent = new TargetOpponent(); - targetOpponent.setNotTarget(true); + targetOpponent.withNotTarget(true); player.choose(outcome, targetOpponent, source, game); Player opponent = game.getPlayer(targetOpponent.getFirstTarget()); if (opponent != null) { diff --git a/Mage.Sets/src/mage/cards/r/ReapIntellect.java b/Mage.Sets/src/mage/cards/r/ReapIntellect.java index 5e71b18023d..2385ec13cb4 100644 --- a/Mage.Sets/src/mage/cards/r/ReapIntellect.java +++ b/Mage.Sets/src/mage/cards/r/ReapIntellect.java @@ -84,7 +84,7 @@ class ReapIntellectEffect extends OneShotEffect { Cards exiledCards = new CardsImpl(); int xCost = Math.min(source.getManaCostsToPay().getX(), targetPlayer.getHand().size()); TargetCard target = new TargetCard(0, xCost, Zone.HAND, filterNonLands); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(Outcome.Benefit, targetPlayer.getHand(), target, source, game); for (UUID cardId : target.getTargets()) { Card chosenCard = game.getCard(cardId); diff --git a/Mage.Sets/src/mage/cards/r/Recall.java b/Mage.Sets/src/mage/cards/r/Recall.java index 3a3ff25ddaa..b7d8091db41 100644 --- a/Mage.Sets/src/mage/cards/r/Recall.java +++ b/Mage.Sets/src/mage/cards/r/Recall.java @@ -67,7 +67,7 @@ class RecallEffect extends OneShotEffect { if (!cardsDiscarded.isEmpty()) { // then return a card from your graveyard to your hand for each card discarded this way TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(cardsDiscarded.size(), new FilterCard()); - target.setNotTarget(true); + target.withNotTarget(true); target.choose(Outcome.ReturnToHand, controller.getId(), source.getSourceId(), source, game); controller.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); } diff --git a/Mage.Sets/src/mage/cards/r/ReckonerShakedown.java b/Mage.Sets/src/mage/cards/r/ReckonerShakedown.java index 555102405f5..670a2c37251 100644 --- a/Mage.Sets/src/mage/cards/r/ReckonerShakedown.java +++ b/Mage.Sets/src/mage/cards/r/ReckonerShakedown.java @@ -92,7 +92,7 @@ class ReckonerShakedownEffect extends OneShotEffect { return true; } TargetPermanent targetPermanent = new TargetPermanent(filter); - targetPermanent.setNotTarget(true); + targetPermanent.withNotTarget(true); controller.choose(Outcome.BoostCreature, targetPermanent, source, game); Permanent permanent = game.getPermanent(targetPermanent.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/r/RegnasSanction.java b/Mage.Sets/src/mage/cards/r/RegnasSanction.java index 91d66e9afce..fb0c2883614 100644 --- a/Mage.Sets/src/mage/cards/r/RegnasSanction.java +++ b/Mage.Sets/src/mage/cards/r/RegnasSanction.java @@ -81,7 +81,7 @@ class RegnasSanctionEffect extends OneShotEffect { FilterPermanent filterToTap = new FilterCreaturePermanent(); for (Player player : choice.getFoes()) { TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (game.getBattlefield().contains(filter, source, game, 1) && player.choose(Outcome.Benefit, target, source, game)) { filterToTap.add(Predicates.not(new PermanentIdPredicate(target.getFirstTarget()))); diff --git a/Mage.Sets/src/mage/cards/r/Reincarnation.java b/Mage.Sets/src/mage/cards/r/Reincarnation.java index ce095cae69b..6b5300bc1f8 100644 --- a/Mage.Sets/src/mage/cards/r/Reincarnation.java +++ b/Mage.Sets/src/mage/cards/r/Reincarnation.java @@ -74,7 +74,7 @@ class ReincarnationEffect extends OneShotEffect { FilterCreatureCard filter = new FilterCreatureCard("a creature card from " + owner.getName() + "'s graveyard"); filter.add(new OwnerIdPredicate(owner.getId())); TargetCardInGraveyard target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game) && controller.chooseTarget(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java index bbaa2a37399..6b7a902082b 100644 --- a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java +++ b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java @@ -83,7 +83,7 @@ class ReinsOfTheVinesteedEffect extends OneShotEffect { ); FILTER.add(new SharesCreatureTypePredicate(lastStateCreature)); TargetPermanent target = new TargetPermanent(FILTER); - target.setNotTarget(true); + target.withNotTarget(true); if (controller != null && controller.choose(Outcome.PutCardInPlay, target, source, game)) { Permanent targetPermanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java b/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java index 7d83f001b99..9ece2268bee 100644 --- a/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java +++ b/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java @@ -70,7 +70,7 @@ class ResearchEffect extends OneShotEffect { return true; } TargetCard target = new TargetCard(0, 4, Zone.OUTSIDE, new FilterCard("cards you own from outside the game")); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(Outcome.Benefit, controller.getSideboard(), target, source, game)) { controller.shuffleCardsToLibrary(new CardsImpl(target.getTargets()), game, source); } diff --git a/Mage.Sets/src/mage/cards/r/Retether.java b/Mage.Sets/src/mage/cards/r/Retether.java index 1c52b4baade..6887263f9b8 100644 --- a/Mage.Sets/src/mage/cards/r/Retether.java +++ b/Mage.Sets/src/mage/cards/r/Retether.java @@ -99,7 +99,7 @@ class RetetherEffect extends OneShotEffect { } if (target != null) { target.getFilter().add(CardType.CREATURE.getPredicate()); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game)) { target.setTargetName("creature to enchant (" + aura.getLogName() + ')'); if (controller.choose(Outcome.PutCardInPlay, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/r/RevivingVapors.java b/Mage.Sets/src/mage/cards/r/RevivingVapors.java index 350750f985f..7220867bf42 100644 --- a/Mage.Sets/src/mage/cards/r/RevivingVapors.java +++ b/Mage.Sets/src/mage/cards/r/RevivingVapors.java @@ -64,7 +64,7 @@ class RevivingVaporsEffect extends OneShotEffect { card = cards.getRandom(game); } else { TargetCard target = new TargetCard(Zone.LIBRARY, new FilterCard("card to put into your hand")); - target.setNotTarget(true); + target.withNotTarget(true); target.setRequired(true); if (controller.choose(Outcome.DrawCard, cards, target, source, game)) { card = cards.get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/r/RiseOfTheWitchKing.java b/Mage.Sets/src/mage/cards/r/RiseOfTheWitchKing.java index b16ff02eef6..eb4d0838890 100644 --- a/Mage.Sets/src/mage/cards/r/RiseOfTheWitchKing.java +++ b/Mage.Sets/src/mage/cards/r/RiseOfTheWitchKing.java @@ -81,7 +81,7 @@ class RiseOfTheWitchKingEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(playerId, source, game)) { continue; } diff --git a/Mage.Sets/src/mage/cards/r/RofellossGift.java b/Mage.Sets/src/mage/cards/r/RofellossGift.java index afde46000ea..25f76fde747 100644 --- a/Mage.Sets/src/mage/cards/r/RofellossGift.java +++ b/Mage.Sets/src/mage/cards/r/RofellossGift.java @@ -77,7 +77,7 @@ class RofellossGiftEffect extends OneShotEffect { player.revealCards(source, revealedCards, game); int enchantmentsToReturn = Math.min(player.getGraveyard().count(filter2, game), targetCardInHand.getTargets().size()); TargetCardInYourGraveyard targetCardInYourGraveyard = new TargetCardInYourGraveyard(enchantmentsToReturn, filter2); - targetCardInYourGraveyard.setNotTarget(true); + targetCardInYourGraveyard.withNotTarget(true); if (!player.choose(outcome, targetCardInYourGraveyard, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/r/RogueSkycaptain.java b/Mage.Sets/src/mage/cards/r/RogueSkycaptain.java index 63fa0d1195e..f662447c233 100644 --- a/Mage.Sets/src/mage/cards/r/RogueSkycaptain.java +++ b/Mage.Sets/src/mage/cards/r/RogueSkycaptain.java @@ -89,7 +89,7 @@ class RogueSkycaptainEffect extends OneShotEffect { opponent = game.getPlayer(opponents.iterator().next()); } else { Target target = new TargetOpponent(true); - target.setNotTarget(true); + target.withNotTarget(true); target.choose(Outcome.GainControl, source.getControllerId(), source.getSourceId(), source, game); opponent = game.getPlayer(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/r/RootsOfWisdom.java b/Mage.Sets/src/mage/cards/r/RootsOfWisdom.java index 4ed83007bb2..99aecce8fa9 100644 --- a/Mage.Sets/src/mage/cards/r/RootsOfWisdom.java +++ b/Mage.Sets/src/mage/cards/r/RootsOfWisdom.java @@ -74,7 +74,7 @@ class RootsOfWisdomEffect extends OneShotEffect { } player.millCards(3, source, game); TargetCard targetCard = new TargetCardInYourGraveyard(filter); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); if (targetCard.canChoose(source.getControllerId(), source, game) && player.choose(outcome, targetCard, source, game)) { Card card = player.getGraveyard().get(targetCard.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/r/RunedCrown.java b/Mage.Sets/src/mage/cards/r/RunedCrown.java index 82c19f7d8cf..85a5f8956db 100644 --- a/Mage.Sets/src/mage/cards/r/RunedCrown.java +++ b/Mage.Sets/src/mage/cards/r/RunedCrown.java @@ -88,7 +88,7 @@ class RunedCrownEffect extends OneShotEffect { Zone zone = null; if (controller.chooseUse(Outcome.Neutral, "Search your graveyard for a Rune card?", source, game)) { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(Outcome.PutCardInPlay, controller.getGraveyard(), target, source, game)) { card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/s/SaheelisDirective.java b/Mage.Sets/src/mage/cards/s/SaheelisDirective.java index c8827aee2b0..801b044dc35 100644 --- a/Mage.Sets/src/mage/cards/s/SaheelisDirective.java +++ b/Mage.Sets/src/mage/cards/s/SaheelisDirective.java @@ -73,7 +73,7 @@ class SaheelisDirectiveEffect extends OneShotEffect { FilterCard filter = new FilterArtifactCard("artifact cards with mana value " + xValue + " or less to put onto the battlefield"); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, xValue + 1)); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.LIBRARY, filter); - target1.setNotTarget(true); + target1.withNotTarget(true); controller.choose(Outcome.PutCardInPlay, cards, target1, source, game); Cards toBattlefield = new CardsImpl(target1.getTargets()); cards.removeAll(toBattlefield); diff --git a/Mage.Sets/src/mage/cards/s/SailIntoTheWest.java b/Mage.Sets/src/mage/cards/s/SailIntoTheWest.java index e0bb49b46b5..341955abcc5 100644 --- a/Mage.Sets/src/mage/cards/s/SailIntoTheWest.java +++ b/Mage.Sets/src/mage/cards/s/SailIntoTheWest.java @@ -102,7 +102,7 @@ class SailIntoTheWestEffect extends OneShotEffect { FilterCard filter = new FilterCard("card from your graveyard"); filter.add(new OwnerIdPredicate(player.getId())); Target targetCard = new TargetCardInGraveyard(0,2,filter); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); if (targetCard.canChoose(player.getId(), source, game)) { if (player.chooseTarget(Outcome.ReturnToHand, targetCard, source, game)) { diff --git a/Mage.Sets/src/mage/cards/s/SakashimasWill.java b/Mage.Sets/src/mage/cards/s/SakashimasWill.java index 30647a25d5f..7345b329420 100644 --- a/Mage.Sets/src/mage/cards/s/SakashimasWill.java +++ b/Mage.Sets/src/mage/cards/s/SakashimasWill.java @@ -77,7 +77,7 @@ class SakashimasWillStealEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(player.getId(), source, game)) { return false; } @@ -115,7 +115,7 @@ class SakashimasWillCopyEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(player.getId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/SauronLordOfTheRings.java b/Mage.Sets/src/mage/cards/s/SauronLordOfTheRings.java index d30ab637ea5..08f97876a5c 100644 --- a/Mage.Sets/src/mage/cards/s/SauronLordOfTheRings.java +++ b/Mage.Sets/src/mage/cards/s/SauronLordOfTheRings.java @@ -92,7 +92,7 @@ class SauronLordOfTheRingsEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); return card != null && player.moveCards(card, Zone.BATTLEFIELD, source, game); diff --git a/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java b/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java index ebb917bb457..395fd3d4e80 100644 --- a/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java +++ b/Mage.Sets/src/mage/cards/s/SavraQueenOfTheGolgari.java @@ -110,7 +110,7 @@ class SavraSacrificeEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null && !playerId.equals(source.getControllerId())) { TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(player.getId(), source, game)) { player.chooseTarget(Outcome.Sacrifice, target, source, game); perms.addAll(target.getTargets()); diff --git a/Mage.Sets/src/mage/cards/s/ScarscaleRitual.java b/Mage.Sets/src/mage/cards/s/ScarscaleRitual.java index 55d58ab2e3d..3f86866960e 100644 --- a/Mage.Sets/src/mage/cards/s/ScarscaleRitual.java +++ b/Mage.Sets/src/mage/cards/s/ScarscaleRitual.java @@ -68,7 +68,7 @@ class ScarscaleRitualCost extends CostImpl { Player controller = game.getPlayer(ability.getControllerId()); if (controller != null) { Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(Outcome.UnboostCreature, target, ability, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/s/Scrounge.java b/Mage.Sets/src/mage/cards/s/Scrounge.java index a98052351b3..e16148866d2 100644 --- a/Mage.Sets/src/mage/cards/s/Scrounge.java +++ b/Mage.Sets/src/mage/cards/s/Scrounge.java @@ -63,7 +63,7 @@ class ScroungeEffect extends OneShotEffect { FilterArtifactCard filter = new FilterArtifactCard(); filter.add(new OwnerIdPredicate(opponent.getId())); TargetCardInGraveyard chosenCard = new TargetCardInGraveyard(filter); - chosenCard.setNotTarget(true); + chosenCard.withNotTarget(true); if (chosenCard.canChoose(opponent.getId(), source, game)) { opponent.chooseTarget(Outcome.ReturnToHand, chosenCard, source, game); Card card = game.getCard(chosenCard.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SculptedSunburst.java b/Mage.Sets/src/mage/cards/s/SculptedSunburst.java index 610faf905ed..bad3b52c5ac 100644 --- a/Mage.Sets/src/mage/cards/s/SculptedSunburst.java +++ b/Mage.Sets/src/mage/cards/s/SculptedSunburst.java @@ -74,7 +74,7 @@ class SculptedSunburstEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { @@ -96,7 +96,7 @@ class SculptedSunburstEffect extends OneShotEffect { continue; } TargetPermanent targetPermanent = new TargetPermanent(filter); - targetPermanent.setNotTarget(true); + targetPermanent.withNotTarget(true); opponent.choose(outcome, targetPermanent, source, game); set.add(targetPermanent.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/s/SeizeTheSpotlight.java b/Mage.Sets/src/mage/cards/s/SeizeTheSpotlight.java index 77c228bdbee..8c5d5a8b8f5 100644 --- a/Mage.Sets/src/mage/cards/s/SeizeTheSpotlight.java +++ b/Mage.Sets/src/mage/cards/s/SeizeTheSpotlight.java @@ -91,7 +91,7 @@ class SeizeTheSpotlightEffect extends OneShotEffect { FilterPermanent filter = new FilterCreaturePermanent("creature controlled by " + opponent.getName()); filter.add(new ControllerIdPredicate(opponent.getId())); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getSourceId(), source, game)) { continue; } diff --git a/Mage.Sets/src/mage/cards/s/SelflessGlyphweaver.java b/Mage.Sets/src/mage/cards/s/SelflessGlyphweaver.java index b3740d8c77b..403bb088851 100644 --- a/Mage.Sets/src/mage/cards/s/SelflessGlyphweaver.java +++ b/Mage.Sets/src/mage/cards/s/SelflessGlyphweaver.java @@ -81,7 +81,7 @@ class DeadlyVanityEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetCreatureOrPlaneswalker(); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); FilterPermanent filter = new FilterCreatureOrPlaneswalkerPermanent(); diff --git a/Mage.Sets/src/mage/cards/s/SengirNosferatu.java b/Mage.Sets/src/mage/cards/s/SengirNosferatu.java index d5f6c799be7..62080c300c9 100644 --- a/Mage.Sets/src/mage/cards/s/SengirNosferatu.java +++ b/Mage.Sets/src/mage/cards/s/SengirNosferatu.java @@ -86,7 +86,7 @@ class ReturnSengirNosferatuEffect extends OneShotEffect { return false; } Target target = new TargetCardInExile(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(controller.getId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/SequesteredStash.java b/Mage.Sets/src/mage/cards/s/SequesteredStash.java index b085c03be6f..514e6e90d4b 100644 --- a/Mage.Sets/src/mage/cards/s/SequesteredStash.java +++ b/Mage.Sets/src/mage/cards/s/SequesteredStash.java @@ -74,7 +74,7 @@ class SequesteredStashEffect extends OneShotEffect { return false; } TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_ARTIFACT_FROM_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game) && controller.chooseUse(outcome, "Put an artifact card from your graveyard to library?", source, game) && controller.choose(outcome, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowKin.java b/Mage.Sets/src/mage/cards/s/ShadowKin.java index 28639c53a17..0f4fc8fa159 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowKin.java +++ b/Mage.Sets/src/mage/cards/s/ShadowKin.java @@ -86,7 +86,7 @@ class ShadowKinEffect extends OneShotEffect { TargetCardInGraveyard target = new TargetCardInGraveyard( 0, 1, StaticFilters.FILTER_CARD_CREATURE ); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, cards, target, source, game); Card card = game.getCard(target.getFirstTarget()); Permanent sourcePermanent = source.getSourcePermanentIfItStillExists(game); diff --git a/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java b/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java index b9d17a6e2bf..d978a28a417 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java +++ b/Mage.Sets/src/mage/cards/s/ShadowfaxLordOfHorses.java @@ -87,7 +87,7 @@ class ShadowfaxLordOfHorsesEffect extends OneShotEffect { FilterCreatureCard filter = new FilterCreatureCard("a creature card with lesser power"); filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, shadowfax.getPower().getValue())); TargetCardInHand target = new TargetCardInHand(0,1,filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, player.getHand(), target, source, game)) { return false; diff --git a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java index f0f0d33b38b..dcec812e023 100644 --- a/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java +++ b/Mage.Sets/src/mage/cards/s/ShattergangBrothers.java @@ -96,7 +96,7 @@ class ShattergangBrothersEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null) { TargetControlledPermanent target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(playerId, source, game) && player.chooseTarget(outcome, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/s/ShelobDreadWeaver.java b/Mage.Sets/src/mage/cards/s/ShelobDreadWeaver.java index 2a1eb60a0a7..751838486e8 100644 --- a/Mage.Sets/src/mage/cards/s/ShelobDreadWeaver.java +++ b/Mage.Sets/src/mage/cards/s/ShelobDreadWeaver.java @@ -131,7 +131,7 @@ class ShelobDreadWeaverCost extends CostImpl { Player controller = game.getPlayer(controllerId); if (controller != null) { TargetCardInExile target = new TargetCardInExile(new FilterCreatureCard(), CardUtil.getCardExileZoneId(game, ability)); - target.setNotTarget(true); + target.withNotTarget(true); Cards cards = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, ability)); if (cards != null && !cards.isEmpty() diff --git a/Mage.Sets/src/mage/cards/s/ShimianSpecter.java b/Mage.Sets/src/mage/cards/s/ShimianSpecter.java index 0dbb006aad6..d182832e8c1 100644 --- a/Mage.Sets/src/mage/cards/s/ShimianSpecter.java +++ b/Mage.Sets/src/mage/cards/s/ShimianSpecter.java @@ -91,7 +91,7 @@ class ShimianSpecterEffect extends OneShotEffect { // You choose a nonland card from it TargetCard target = new TargetCard(Zone.HAND, new FilterNonlandCard()); - target.setNotTarget(true); + target.withNotTarget(true); Card chosenCard = null; if (target.canChoose(controller.getId(), source, game) && controller.chooseTarget(Outcome.Benefit, targetPlayer.getHand(), target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/s/ShroudedLore.java b/Mage.Sets/src/mage/cards/s/ShroudedLore.java index e2efaf4ac91..96550d6808a 100644 --- a/Mage.Sets/src/mage/cards/s/ShroudedLore.java +++ b/Mage.Sets/src/mage/cards/s/ShroudedLore.java @@ -71,7 +71,7 @@ class ShroudedLoreEffect extends OneShotEffect { boolean done = false; do { chosenCard = new TargetCardInGraveyard(filter); - chosenCard.setNotTarget(true); + chosenCard.withNotTarget(true); if (chosenCard.canChoose(opponent.getId(), source, game)) { opponent.chooseTarget(Outcome.ReturnToHand, chosenCard, source, game); card = game.getCard(chosenCard.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java index fdce7586dfa..eaa7dcba21d 100644 --- a/Mage.Sets/src/mage/cards/s/SimicGuildmage.java +++ b/Mage.Sets/src/mage/cards/s/SimicGuildmage.java @@ -186,7 +186,7 @@ class MoveAuraEffect extends OneShotEffect { } boolean passed = true; Target chosenPermanentToAttachAuras = aura.getSpellAbility().getTargets().get(0).copy(); - chosenPermanentToAttachAuras.setNotTarget(true); + chosenPermanentToAttachAuras.withNotTarget(true); Filter filterChoice = chosenPermanentToAttachAuras.getFilter(); filterChoice.add(new ControllerIdPredicate(fromPermanent.getControllerId())); filterChoice.add(Predicates.not(new PermanentIdPredicate(fromPermanent.getId()))); diff --git a/Mage.Sets/src/mage/cards/s/SingleCombat.java b/Mage.Sets/src/mage/cards/s/SingleCombat.java index dd1dc7b1bf0..dcc4447385f 100644 --- a/Mage.Sets/src/mage/cards/s/SingleCombat.java +++ b/Mage.Sets/src/mage/cards/s/SingleCombat.java @@ -81,7 +81,7 @@ class SingleCombatEffect extends OneShotEffect { continue; } Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(outcome, target, source, game)) { filterSac.add(Predicates.not(new PermanentIdPredicate(target.getFirstTarget()))); } diff --git a/Mage.Sets/src/mage/cards/s/Skullwinder.java b/Mage.Sets/src/mage/cards/s/Skullwinder.java index 3251a6de065..cac97579dd8 100644 --- a/Mage.Sets/src/mage/cards/s/Skullwinder.java +++ b/Mage.Sets/src/mage/cards/s/Skullwinder.java @@ -82,7 +82,7 @@ class SkullwinderEffect extends OneShotEffect { game.informPlayers(sourceObject.getLogName() + ": " + controller.getLogName() + " has chosen " + opponent.getLogName()); // That player returns a card from their graveyard to their hand TargetCardInYourGraveyard targetCard = new TargetCardInYourGraveyard(new FilterCard("a card from your graveyard to return to your hand")); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); if (opponent.choose(outcome, targetCard, source, game)) { Card card = game.getCard(targetCard.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/s/Slithermuse.java b/Mage.Sets/src/mage/cards/s/Slithermuse.java index 8dbab580d9f..06d15c68e5b 100644 --- a/Mage.Sets/src/mage/cards/s/Slithermuse.java +++ b/Mage.Sets/src/mage/cards/s/Slithermuse.java @@ -76,7 +76,7 @@ class SlithermuseEffect extends OneShotEffect { Permanent permanent = (Permanent)game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD); if (player != null && permanent != null) { TargetOpponent target = new TargetOpponent(); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(this.outcome, target, source, game)) { Player chosenPlayer = game.getPlayer(target.getFirstTarget()); if (chosenPlayer != null) { diff --git a/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java b/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java index 6b4dc88f0d9..ea01a189dba 100644 --- a/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java +++ b/Mage.Sets/src/mage/cards/s/SovereignsOfLostAlara.java @@ -70,7 +70,7 @@ class SovereignsOfLostAlaraEffect extends OneShotEffect { filter.add(SubType.AURA.getPredicate()); filter.add(new AuraCardCanAttachToPermanentId(attackingCreature.getId())); TargetCardInLibrary target = new TargetCardInLibrary(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.searchLibrary(target, source, game)) { if (target.getFirstTarget() != null) { Card aura = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SpectersShriek.java b/Mage.Sets/src/mage/cards/s/SpectersShriek.java index e6a4c4fc75a..2f38e613c3e 100644 --- a/Mage.Sets/src/mage/cards/s/SpectersShriek.java +++ b/Mage.Sets/src/mage/cards/s/SpectersShriek.java @@ -77,7 +77,7 @@ class SpectersShriekEffect extends OneShotEffect { return false; } TargetCard target = new TargetCard(Zone.HAND, new FilterNonlandCard()); - target.setNotTarget(true); + target.withNotTarget(true); target.setRequired(false); if (!controller.chooseTarget(Outcome.Benefit, player.getHand(), target, source, game)) { return false; @@ -93,7 +93,7 @@ class SpectersShriekEffect extends OneShotEffect { return true; } target = new TargetCardInHand(filter); - target.setNotTarget(true); + target.withNotTarget(true); return controller.choose(Outcome.Detriment, controller.getHand(), target, source, game) && controller.moveCards(game.getCard(target.getFirstTarget()), Zone.EXILED, source, game); } diff --git a/Mage.Sets/src/mage/cards/s/SplitTheSpoils.java b/Mage.Sets/src/mage/cards/s/SplitTheSpoils.java index 4d43d39d09f..33d0ceeb173 100644 --- a/Mage.Sets/src/mage/cards/s/SplitTheSpoils.java +++ b/Mage.Sets/src/mage/cards/s/SplitTheSpoils.java @@ -70,7 +70,7 @@ class SplitTheSpoilsEffect extends OneShotEffect { } player.moveCards(cards, Zone.EXILED, source, game); TargetCard target = new TargetCardInExile(0, 5, StaticFilters.FILTER_CARD, null); - target.withChooseHint("To put in pile 1").setNotTarget(true); + target.withChooseHint("To put in pile 1").withNotTarget(true); player.choose(outcome, cards, target, source, game); List pile1 = new ArrayList<>(); target.getTargets() @@ -82,7 +82,7 @@ class SplitTheSpoilsEffect extends OneShotEffect { cards.removeIf(target.getTargets()::contains); pile2.addAll(cards.getCards(game)); TargetOpponent targetOpponent = new TargetOpponent(); - targetOpponent.setNotTarget(true); + targetOpponent.withNotTarget(true); player.choose(outcome, targetOpponent, source, game); if (game.getPlayer(targetOpponent.getFirstTarget()).choosePile( outcome, "Choose a pile to go to hand (the other goes to graveyard)", pile1, pile2, game diff --git a/Mage.Sets/src/mage/cards/s/StarlightSpectacular.java b/Mage.Sets/src/mage/cards/s/StarlightSpectacular.java index 7429f354d3c..2bb34137597 100644 --- a/Mage.Sets/src/mage/cards/s/StarlightSpectacular.java +++ b/Mage.Sets/src/mage/cards/s/StarlightSpectacular.java @@ -74,7 +74,7 @@ class StarlightSpectacularEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(count); - target.setNotTarget(true); + target.withNotTarget(true); target.withChooseHint("the first creature you choose gets +0/+0"); player.choose(outcome, target, source, game); int boost = 0; diff --git a/Mage.Sets/src/mage/cards/s/SteamVines.java b/Mage.Sets/src/mage/cards/s/SteamVines.java index e549bca9671..a9f9eb2cd76 100644 --- a/Mage.Sets/src/mage/cards/s/SteamVines.java +++ b/Mage.Sets/src/mage/cards/s/SteamVines.java @@ -89,7 +89,7 @@ class SteamVinesEffect extends OneShotEffect { } if (!game.getBattlefield().getAllActivePermanents(CardType.LAND, game).isEmpty()) { //lands are available on the battlefield Target target = new TargetLandPermanent(); - target.setNotTarget(true); //not a target, it is chosen + target.withNotTarget(true); //not a target, it is chosen Card steamVinesCard = game.getCard(source.getSourceId()); if (steamVinesCard != null && landsController != null) { if (landsController.choose(Outcome.DestroyPermanent, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/s/StonehewerGiant.java b/Mage.Sets/src/mage/cards/s/StonehewerGiant.java index ac17172072e..383747fe6ac 100644 --- a/Mage.Sets/src/mage/cards/s/StonehewerGiant.java +++ b/Mage.Sets/src/mage/cards/s/StonehewerGiant.java @@ -93,7 +93,7 @@ class StonehewerGiantEffect extends OneShotEffect { controller.moveCards(card, Zone.BATTLEFIELD, source, game); Permanent equipment = game.getPermanent(card.getId()); Target targetCreature = new TargetControlledCreaturePermanent(); - targetCreature.setNotTarget(true); + targetCreature.withNotTarget(true); if (equipment != null && controller.choose(Outcome.BoostCreature, targetCreature, source, game)) { Permanent permanent = game.getPermanent(targetCreature.getFirstTarget()); permanent.addAttachment(equipment.getId(), source, game); diff --git a/Mage.Sets/src/mage/cards/s/StormHerald.java b/Mage.Sets/src/mage/cards/s/StormHerald.java index 59e06b761fd..677884d04ac 100644 --- a/Mage.Sets/src/mage/cards/s/StormHerald.java +++ b/Mage.Sets/src/mage/cards/s/StormHerald.java @@ -95,7 +95,7 @@ class StormHeraldEffect extends OneShotEffect { Set possibleTargets = controller.getGraveyard().getCards(filter, controller.getId(), source, game); if (!possibleTargets.isEmpty()) { TargetCard targetAuras = new TargetCard(0, Integer.MAX_VALUE, Zone.GRAVEYARD, filter); - targetAuras.setNotTarget(true); + targetAuras.withNotTarget(true); controller.chooseTarget(outcome, new CardsImpl(possibleTargets), targetAuras, source, game); // Move the cards to the battlefield to a creature you control @@ -106,7 +106,7 @@ class StormHeraldEffect extends OneShotEffect { FilterPermanent filterAttachTo = new FilterControlledCreaturePermanent("creature you control to attach " + auraCard.getIdName() + " to"); filterAttachTo.add(new StormHeraldAttachableToPredicate(auraCard)); TargetPermanent targetCreature = new TargetPermanent(filterAttachTo); - targetCreature.setNotTarget(true); + targetCreature.withNotTarget(true); if (controller.choose(Outcome.PutCardInPlay, targetCreature, source, game)) { Permanent targetPermanent = game.getPermanent(targetCreature.getFirstTarget()); if (!targetPermanent.cantBeAttachedBy(auraCard, source, game, true)) { diff --git a/Mage.Sets/src/mage/cards/s/StranglingGrasp.java b/Mage.Sets/src/mage/cards/s/StranglingGrasp.java index 93d7e9eb6f4..37d6aba6872 100644 --- a/Mage.Sets/src/mage/cards/s/StranglingGrasp.java +++ b/Mage.Sets/src/mage/cards/s/StranglingGrasp.java @@ -100,7 +100,7 @@ class StranglingGraspEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(player.getId(), source, game)) { player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/s/StreamOfThought.java b/Mage.Sets/src/mage/cards/s/StreamOfThought.java index f6821cbae53..a8c68c6dd29 100644 --- a/Mage.Sets/src/mage/cards/s/StreamOfThought.java +++ b/Mage.Sets/src/mage/cards/s/StreamOfThought.java @@ -67,7 +67,7 @@ class StreamOfThoughtEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(0, 4); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, player.getGraveyard(), target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java b/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java index 118ce63f227..a1b8fb7401f 100644 --- a/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java +++ b/Mage.Sets/src/mage/cards/s/StumpsquallHydra.java @@ -96,7 +96,7 @@ class StumpsquallHydraEffect extends OneShotEffect { return false; } TargetAmount targetAmount = new TargetCreatureOrPlaneswalkerAmount(xValue, filter); - targetAmount.setNotTarget(true); + targetAmount.withNotTarget(true); player.choose(outcome, targetAmount, source, game); for (UUID targetId : targetAmount.getTargets()) { Permanent permanent = game.getPermanent(targetId); diff --git a/Mage.Sets/src/mage/cards/s/SuddenReclamation.java b/Mage.Sets/src/mage/cards/s/SuddenReclamation.java index 3effda7b335..e6a6aeedc2d 100644 --- a/Mage.Sets/src/mage/cards/s/SuddenReclamation.java +++ b/Mage.Sets/src/mage/cards/s/SuddenReclamation.java @@ -66,7 +66,7 @@ class SuddenReclamationEffect extends OneShotEffect { if (controller != null) { Cards cardsToHand = new CardsImpl(); Target target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game) && controller.chooseTarget(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); @@ -75,7 +75,7 @@ class SuddenReclamationEffect extends OneShotEffect { } } target = new TargetCardInYourGraveyard(new FilterLandCard("land card from your graveyard")); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game) && controller.chooseTarget(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/s/SummonUndead.java b/Mage.Sets/src/mage/cards/s/SummonUndead.java index 864efa5b3a9..6b0bb78cfd4 100644 --- a/Mage.Sets/src/mage/cards/s/SummonUndead.java +++ b/Mage.Sets/src/mage/cards/s/SummonUndead.java @@ -67,7 +67,7 @@ class SummonUndeadEffect extends OneShotEffect { return true; } TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); player.moveCards(card, Zone.BATTLEFIELD, source, game); diff --git a/Mage.Sets/src/mage/cards/s/SunderTheGateway.java b/Mage.Sets/src/mage/cards/s/SunderTheGateway.java index 280e3a04c3a..45c397cc35c 100644 --- a/Mage.Sets/src/mage/cards/s/SunderTheGateway.java +++ b/Mage.Sets/src/mage/cards/s/SunderTheGateway.java @@ -88,7 +88,7 @@ class SunderTheGatewayEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java b/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java index 489aff5ce96..05c6af47147 100644 --- a/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java +++ b/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java @@ -107,7 +107,7 @@ class SurgicalExtractionEffect extends OneShotEffect { // cards in Hand filterNamedCard.setMessage("card named " + nameToSearch + " in the hand of " + owner.getName()); TargetCard targetCardInHand = new TargetCard(0, Integer.MAX_VALUE, Zone.HAND, filterNamedCard); - targetCardInHand.setNotTarget(true); + targetCardInHand.withNotTarget(true); if (controller.chooseTarget(Outcome.Exile, owner.getHand(), targetCardInHand, source, game)) { List targets = targetCardInHand.getTargets(); for (UUID targetId : targets) { diff --git a/Mage.Sets/src/mage/cards/s/SwordOfTruthAndJustice.java b/Mage.Sets/src/mage/cards/s/SwordOfTruthAndJustice.java index acafa52317c..794add8c804 100644 --- a/Mage.Sets/src/mage/cards/s/SwordOfTruthAndJustice.java +++ b/Mage.Sets/src/mage/cards/s/SwordOfTruthAndJustice.java @@ -86,7 +86,7 @@ class SwordOfTruthAndJusticeEffect extends OneShotEffect { return false; } Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(outcome, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/s/SynthesisPod.java b/Mage.Sets/src/mage/cards/s/SynthesisPod.java index 1839223e6b2..b196eaceb8b 100644 --- a/Mage.Sets/src/mage/cards/s/SynthesisPod.java +++ b/Mage.Sets/src/mage/cards/s/SynthesisPod.java @@ -66,7 +66,7 @@ class SynthesisPodCost extends CostImpl { SynthesisPodCost() { super(); TargetSpell target = new TargetSpell(filter); - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); this.text = "Exile a spell you control"; } diff --git a/Mage.Sets/src/mage/cards/s/SyphonFlesh.java b/Mage.Sets/src/mage/cards/s/SyphonFlesh.java index 994605630bc..c45b458966f 100644 --- a/Mage.Sets/src/mage/cards/s/SyphonFlesh.java +++ b/Mage.Sets/src/mage/cards/s/SyphonFlesh.java @@ -64,7 +64,7 @@ class SyphonFleshEffect extends OneShotEffect { Player player = game.getPlayer(playerId); if (player != null && !playerId.equals(source.getControllerId())) { TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(player.getId(), source, game)) { player.chooseTarget(Outcome.Sacrifice, target, source, game); perms.addAll(target.getTargets()); diff --git a/Mage.Sets/src/mage/cards/t/TahngarthFirstMate.java b/Mage.Sets/src/mage/cards/t/TahngarthFirstMate.java index 113f12fe3d0..aaff03f92f0 100644 --- a/Mage.Sets/src/mage/cards/t/TahngarthFirstMate.java +++ b/Mage.Sets/src/mage/cards/t/TahngarthFirstMate.java @@ -126,7 +126,7 @@ class TahngarthFirstMateEffect extends OneShotEffect { return false; } TargetPlayerOrPlaneswalker target = new TargetPlayerOrPlaneswalker(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!controller.choose(outcome, target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TakenumaAbandonedMire.java b/Mage.Sets/src/mage/cards/t/TakenumaAbandonedMire.java index ed65d52ceb7..7c3d450cda7 100644 --- a/Mage.Sets/src/mage/cards/t/TakenumaAbandonedMire.java +++ b/Mage.Sets/src/mage/cards/t/TakenumaAbandonedMire.java @@ -86,7 +86,7 @@ class TakenumaAbandonedMireEffect extends OneShotEffect { return true; } TargetCard target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, player.getGraveyard(), target, source, game); return player.moveCards(game.getCard(target.getFirstTarget()), Zone.HAND, source, game); } diff --git a/Mage.Sets/src/mage/cards/t/TangleWire.java b/Mage.Sets/src/mage/cards/t/TangleWire.java index d5cbdeb846e..54fc7f2fa4d 100644 --- a/Mage.Sets/src/mage/cards/t/TangleWire.java +++ b/Mage.Sets/src/mage/cards/t/TangleWire.java @@ -79,7 +79,7 @@ class TangleWireEffect extends OneShotEffect { int amount = Math.min(counterCount, targetCount); Target target = new TargetControlledPermanent(amount, amount, filter, true); - target.setNotTarget(true); + target.withNotTarget(true); if (amount > 0 && player.chooseTarget(Outcome.Tap, target, source, game)) { boolean abilityApplied = false; diff --git a/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java b/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java index a0997903969..94c1d80bae7 100644 --- a/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java +++ b/Mage.Sets/src/mage/cards/t/TasigurTheGoldenFang.java @@ -88,7 +88,7 @@ class TasigurTheGoldenFangEffect extends OneShotEffect { FilterNonlandCard filter = new FilterNonlandCard("nonland card from " + controller.getLogName() + " graveyard"); filter.add(new OwnerIdPredicate(controller.getId())); Target target = new TargetCardInGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); opponent.chooseTarget(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java b/Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java index 9c7785d22fe..51da06480e4 100644 --- a/Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java +++ b/Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java @@ -185,7 +185,7 @@ class TayamLuminousEnigmaEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, player.getGraveyard(), target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TeferiTemporalPilgrim.java b/Mage.Sets/src/mage/cards/t/TeferiTemporalPilgrim.java index 567b85eacf4..372501d953c 100644 --- a/Mage.Sets/src/mage/cards/t/TeferiTemporalPilgrim.java +++ b/Mage.Sets/src/mage/cards/t/TeferiTemporalPilgrim.java @@ -83,7 +83,7 @@ class TeferiTemporalPilgrimEffect extends OneShotEffect { return false; } TargetControlledPermanent target = new TargetControlledPermanent(); - target.setNotTarget(true); + target.withNotTarget(true); opponent.chooseTarget(Outcome.ReturnToHand, target, source, game); Permanent toHand = game.getPermanent(target.getFirstTarget()); if (toHand != null) { diff --git a/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java b/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java index dc7d52794ba..861a46960c7 100644 --- a/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java +++ b/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java @@ -99,7 +99,7 @@ class TemptWithImmortalityEffect extends OneShotEffect { private boolean returnCreatureFromGraveToBattlefield(Player player, Ability source, Game game) { Target target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(false); + target.withNotTarget(false); if (target.canChoose(source.getControllerId(), source, game)) { if (player.chooseTarget(outcome, target, source, game)) { Card card = game.getCard(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java b/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java index ec12e7a72e3..53289404e1a 100644 --- a/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java +++ b/Mage.Sets/src/mage/cards/t/TergridGodOfFright.java @@ -220,7 +220,7 @@ class TergridsLaternEffect extends OneShotEffect { switch (chosen) { case SACRIFICE_CHOICE: TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_NON_LAND); - target.setNotTarget(true); + target.withNotTarget(true); targetedPlayer.choose(Outcome.Sacrifice, target, source, game); Permanent chosenLand = game.getPermanent(target.getFirstTarget()); return chosenLand != null && chosenLand.sacrifice(source, game); diff --git a/Mage.Sets/src/mage/cards/t/TeveshSzatDoomOfFools.java b/Mage.Sets/src/mage/cards/t/TeveshSzatDoomOfFools.java index 4c6f393a382..3e8c2f5d964 100644 --- a/Mage.Sets/src/mage/cards/t/TeveshSzatDoomOfFools.java +++ b/Mage.Sets/src/mage/cards/t/TeveshSzatDoomOfFools.java @@ -98,7 +98,7 @@ class TeveshSzatDoomOfFoolsSacrificeEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TheBlackGate.java b/Mage.Sets/src/mage/cards/t/TheBlackGate.java index fcf794f4072..deabaa52370 100644 --- a/Mage.Sets/src/mage/cards/t/TheBlackGate.java +++ b/Mage.Sets/src/mage/cards/t/TheBlackGate.java @@ -127,7 +127,7 @@ class BlackGateEffect extends OneShotEffect { } TargetPlayer target = new TargetPlayer(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!controller.choose(Outcome.Detriment, target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TheBookOfVileDarkness.java b/Mage.Sets/src/mage/cards/t/TheBookOfVileDarkness.java index 0072d5e5528..9251212f467 100644 --- a/Mage.Sets/src/mage/cards/t/TheBookOfVileDarkness.java +++ b/Mage.Sets/src/mage/cards/t/TheBookOfVileDarkness.java @@ -144,7 +144,7 @@ class TheBookOfVileDarknessCost extends CostImpl { break; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(Outcome.Sacrifice, target, source, game); return game.getPermanent(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/t/TheDeckOfManyThings.java b/Mage.Sets/src/mage/cards/t/TheDeckOfManyThings.java index 0abae3e0874..8095367489a 100644 --- a/Mage.Sets/src/mage/cards/t/TheDeckOfManyThings.java +++ b/Mage.Sets/src/mage/cards/t/TheDeckOfManyThings.java @@ -113,7 +113,7 @@ class TheDeckOfManyThingsRandomEffect extends OneShotEffect { } TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD); target.setRandom(true); - target.setNotTarget(true); + target.withNotTarget(true); target.chooseTarget(outcome, player.getId(), source, game); Card card = game.getCard(target.getFirstTarget()); @@ -145,7 +145,7 @@ class TheDeckOfManyThingsReturnEffect extends OneShotEffect { return false; } TargetCardInGraveyard target = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/t/TheGrandEvolution.java b/Mage.Sets/src/mage/cards/t/TheGrandEvolution.java index f722d5f9a07..9f79f79efca 100644 --- a/Mage.Sets/src/mage/cards/t/TheGrandEvolution.java +++ b/Mage.Sets/src/mage/cards/t/TheGrandEvolution.java @@ -103,7 +103,7 @@ class TheGrandEvolutionEffect extends OneShotEffect { } Cards cards = player.millCards(10, source, game); TargetCard target = new TargetCard(0, 2, Zone.ALL, StaticFilters.FILTER_CARD_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.PutCreatureInPlay, cards, target, source, game); player.moveCards(new CardsImpl(target.getTargets()), Zone.BATTLEFIELD, source, game); return true; diff --git a/Mage.Sets/src/mage/cards/t/TheHorusHeresy.java b/Mage.Sets/src/mage/cards/t/TheHorusHeresy.java index 6e45fd198d8..f8ce4d1471b 100644 --- a/Mage.Sets/src/mage/cards/t/TheHorusHeresy.java +++ b/Mage.Sets/src/mage/cards/t/TheHorusHeresy.java @@ -151,7 +151,7 @@ class TheHorusHeresyDestroyEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.DestroyPermanent, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/t/TheMendingOfDominaria.java b/Mage.Sets/src/mage/cards/t/TheMendingOfDominaria.java index 3f1bbf81dc7..c5964781986 100644 --- a/Mage.Sets/src/mage/cards/t/TheMendingOfDominaria.java +++ b/Mage.Sets/src/mage/cards/t/TheMendingOfDominaria.java @@ -76,7 +76,7 @@ class TheMendingOfDominariaFirstEffect extends OneShotEffect { } new MillCardsControllerEffect(2).apply(game, source); TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game) && controller.chooseUse(outcome, "Return a creature card from your graveyard to hand?", source, game) && controller.choose(Outcome.ReturnToHand, target, source, game)) { diff --git a/Mage.Sets/src/mage/cards/t/TheMimeoplasm.java b/Mage.Sets/src/mage/cards/t/TheMimeoplasm.java index 1f11b7e4ad0..44d3d6360ee 100644 --- a/Mage.Sets/src/mage/cards/t/TheMimeoplasm.java +++ b/Mage.Sets/src/mage/cards/t/TheMimeoplasm.java @@ -70,14 +70,14 @@ class TheMimeoplasmEffect extends OneShotEffect { if (new CardsInAllGraveyardsCount(StaticFilters.FILTER_CARD_CREATURE).calculate(game, source, this) >= 2) { if (controller.chooseUse(Outcome.Benefit, "Do you want to exile two creature cards from graveyards?", source, game)) { TargetCardInGraveyard targetCopy = new TargetCardInGraveyard(new FilterCreatureCard("creature card to become a copy of")); - targetCopy.setNotTarget(true); + targetCopy.withNotTarget(true); if (controller.choose(Outcome.Copy, targetCopy, source, game)) { Card cardToCopy = game.getCard(targetCopy.getFirstTarget()); if (cardToCopy != null) { FilterCreatureCard filter = new FilterCreatureCard("creature card to determine amount of additional +1/+1 counters"); filter.add(Predicates.not(new CardIdPredicate(cardToCopy.getId()))); TargetCardInGraveyard targetCounters = new TargetCardInGraveyard(filter); - targetCounters.setNotTarget(true); + targetCounters.withNotTarget(true); if (controller.choose(Outcome.Copy, targetCounters, source, game)) { Card cardForCounters = game.getCard(targetCounters.getFirstTarget()); if (cardForCounters != null) { diff --git a/Mage.Sets/src/mage/cards/t/TheThreeSeasons.java b/Mage.Sets/src/mage/cards/t/TheThreeSeasons.java index 338b3670ad5..ccb867bf2e6 100644 --- a/Mage.Sets/src/mage/cards/t/TheThreeSeasons.java +++ b/Mage.Sets/src/mage/cards/t/TheThreeSeasons.java @@ -98,7 +98,7 @@ class TheThreeSeasonsEffect extends OneShotEffect { continue; } TargetCard target = new TargetCardInGraveyard(cardCount, StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); controller.chooseTarget(outcome, player.getGraveyard(), target, source, game); playerCardsMap.put(player, new CardsImpl(target.getTargets())); } diff --git a/Mage.Sets/src/mage/cards/t/ThelonsChant.java b/Mage.Sets/src/mage/cards/t/ThelonsChant.java index cb484b235c4..8b2d0205900 100644 --- a/Mage.Sets/src/mage/cards/t/ThelonsChant.java +++ b/Mage.Sets/src/mage/cards/t/ThelonsChant.java @@ -73,7 +73,7 @@ class ThelonsChantEffect extends OneShotEffect { if (player != null && sourcePermanent != null) { boolean paid = false; TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (player.chooseUse(Outcome.Detriment, "Put a -1/-1 counter on a creature you control? (otherwise " + sourcePermanent.getLogName() + " deals 3 damage to you)", source, game) && player.choose(Outcome.UnboostCreature, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/t/Thunderwave.java b/Mage.Sets/src/mage/cards/t/Thunderwave.java index 30a5b6c9de4..9b014349517 100644 --- a/Mage.Sets/src/mage/cards/t/Thunderwave.java +++ b/Mage.Sets/src/mage/cards/t/Thunderwave.java @@ -73,7 +73,7 @@ class ThunderwaveEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(0, 1); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); for (Permanent permanent : game.getBattlefield().getActivePermanents( StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), source, game diff --git a/Mage.Sets/src/mage/cards/t/TimeWipe.java b/Mage.Sets/src/mage/cards/t/TimeWipe.java index 4776badd776..f6e5d355f5b 100644 --- a/Mage.Sets/src/mage/cards/t/TimeWipe.java +++ b/Mage.Sets/src/mage/cards/t/TimeWipe.java @@ -62,7 +62,7 @@ class TimeWipeEffect extends OneShotEffect { return false; } Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (player.choose(outcome, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/t/TitanOfIndustry.java b/Mage.Sets/src/mage/cards/t/TitanOfIndustry.java index 7b51f141f34..c943d71f7b0 100644 --- a/Mage.Sets/src/mage/cards/t/TitanOfIndustry.java +++ b/Mage.Sets/src/mage/cards/t/TitanOfIndustry.java @@ -99,7 +99,7 @@ class TitanOfIndustryEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); return permanent != null && permanent.addCounters(CounterType.SHIELD.createInstance(), source, game); diff --git a/Mage.Sets/src/mage/cards/t/TombFortress.java b/Mage.Sets/src/mage/cards/t/TombFortress.java index f8124f47672..87daaecde08 100644 --- a/Mage.Sets/src/mage/cards/t/TombFortress.java +++ b/Mage.Sets/src/mage/cards/t/TombFortress.java @@ -79,7 +79,7 @@ class TombFortressEffect extends OneShotEffect { } player.millCards(4, source, game); TargetCard target = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return true; } diff --git a/Mage.Sets/src/mage/cards/t/TormentOfHailfire.java b/Mage.Sets/src/mage/cards/t/TormentOfHailfire.java index 7af2d556212..e8907636797 100644 --- a/Mage.Sets/src/mage/cards/t/TormentOfHailfire.java +++ b/Mage.Sets/src/mage/cards/t/TormentOfHailfire.java @@ -68,7 +68,7 @@ class TormentOfHailfireEffect extends OneShotEffect { if (permanents > 0 && opponent.chooseUse(outcome, "Sacrifices a nonland permanent? (Iteration " + i + " of " + repeat + ")", "Otherwise you have to discard a card or lose 3 life.", "Sacrifice", "Discard or life loss", source, game)) { Target target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_NON_LAND); - target.setNotTarget(true); + target.withNotTarget(true); if (opponent.choose(outcome, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/t/TorrentSculptor.java b/Mage.Sets/src/mage/cards/t/TorrentSculptor.java index 14fddc2e096..26ebb4a5316 100644 --- a/Mage.Sets/src/mage/cards/t/TorrentSculptor.java +++ b/Mage.Sets/src/mage/cards/t/TorrentSculptor.java @@ -86,7 +86,7 @@ class TorrentSculptorEffect extends OneShotEffect { return false; } TargetCard targetCard = new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); player.choose(Outcome.Exile, targetCard, source, game); Card card = game.getCard(targetCard.getFirstTarget()); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/t/TourachsChant.java b/Mage.Sets/src/mage/cards/t/TourachsChant.java index bad34664146..716d31630c5 100644 --- a/Mage.Sets/src/mage/cards/t/TourachsChant.java +++ b/Mage.Sets/src/mage/cards/t/TourachsChant.java @@ -73,7 +73,7 @@ class TourachsChantEffect extends OneShotEffect { if (player != null && sourcePermanent != null) { boolean paid = false; TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (player.chooseUse(Outcome.Detriment, "Put a -1/-1 counter on a creature you control? (otherwise " + sourcePermanent.getLogName() + " deals 3 damage to you)", source, game) && player.choose(Outcome.UnboostCreature, target, source, game)) { Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/t/TrapTheTrespassers.java b/Mage.Sets/src/mage/cards/t/TrapTheTrespassers.java index 322521ee881..7fa0a9fed61 100644 --- a/Mage.Sets/src/mage/cards/t/TrapTheTrespassers.java +++ b/Mage.Sets/src/mage/cards/t/TrapTheTrespassers.java @@ -98,7 +98,7 @@ class TrapTheTrespassersVote extends VoteHandler { @Override protected Permanent playerChoose(String voteInfo, Player player, Player decidingPlayer, Ability source, Game game) { TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); decidingPlayer.choose(Outcome.UnboostCreature, target, source, game); return game.getPermanent(target.getFirstTarget()); } diff --git a/Mage.Sets/src/mage/cards/t/TravelThroughCaradhras.java b/Mage.Sets/src/mage/cards/t/TravelThroughCaradhras.java index ea3a8dd26ad..a7c91894454 100644 --- a/Mage.Sets/src/mage/cards/t/TravelThroughCaradhras.java +++ b/Mage.Sets/src/mage/cards/t/TravelThroughCaradhras.java @@ -87,7 +87,7 @@ class TravelThroughCaradhrasEffect extends OneShotEffect { } if (minesOfMoria > 0) { TargetCard target = new TargetCardInYourGraveyard(Math.min(minesOfMoria, player.getGraveyard().size())); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, player.getGraveyard(), target, source, game); player.moveCards(new CardsImpl(target.getTargets()), Zone.HAND, source, game); } diff --git a/Mage.Sets/src/mage/cards/t/TravelingPlague.java b/Mage.Sets/src/mage/cards/t/TravelingPlague.java index 2b06449d4b4..851f480a396 100644 --- a/Mage.Sets/src/mage/cards/t/TravelingPlague.java +++ b/Mage.Sets/src/mage/cards/t/TravelingPlague.java @@ -131,7 +131,7 @@ class TravelingPlagueEffect extends OneShotEffect { && game.getState().getZone(travelingPlague.getId()) == Zone.GRAVEYARD // aura must come from the graveyard && controllerOfEnchantedCreature != null) { TargetPermanent target = new TargetPermanent(new FilterCreaturePermanent("creature to enchant with " + travelingPlague.getName())); - target.setNotTarget(true); + target.withNotTarget(true); if (controllerOfEnchantedCreature.choose(Outcome.Detriment, target, source, game)) { Permanent targetPermanent = game.getPermanent(target.getFirstTarget()); if (!targetPermanent.cantBeAttachedBy(travelingPlague, source, game, false)) { diff --git a/Mage.Sets/src/mage/cards/t/TriarchStalker.java b/Mage.Sets/src/mage/cards/t/TriarchStalker.java index 75c4600cbf3..395e5f3eac5 100644 --- a/Mage.Sets/src/mage/cards/t/TriarchStalker.java +++ b/Mage.Sets/src/mage/cards/t/TriarchStalker.java @@ -92,7 +92,7 @@ class TriarchStalkerEffect extends OneShotEffect { return false; } TargetOpponent target = new TargetOpponent(); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Player chosenPlayer = game.getPlayer(target.getFirstTarget()); if (chosenPlayer == null) { diff --git a/Mage.Sets/src/mage/cards/t/TymaretCallsTheDead.java b/Mage.Sets/src/mage/cards/t/TymaretCallsTheDead.java index a54089c2810..6226f9e23aa 100644 --- a/Mage.Sets/src/mage/cards/t/TymaretCallsTheDead.java +++ b/Mage.Sets/src/mage/cards/t/TymaretCallsTheDead.java @@ -94,7 +94,7 @@ class TymaretCallsTheDeadFirstEffect extends OneShotEffect { return true; } TargetCard target = new TargetCardInYourGraveyard(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, player.getGraveyard(), target, source, game)) { return true; } diff --git a/Mage.Sets/src/mage/cards/t/TyvarJubilantBrawler.java b/Mage.Sets/src/mage/cards/t/TyvarJubilantBrawler.java index 67a0d5ff743..20a96e0b29c 100644 --- a/Mage.Sets/src/mage/cards/t/TyvarJubilantBrawler.java +++ b/Mage.Sets/src/mage/cards/t/TyvarJubilantBrawler.java @@ -122,7 +122,7 @@ class TyvarJubilantBrawlerReturnEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(0, 1, filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Card card = game.getCard(target.getFirstTarget()); return card != null && player.moveCards(card, Zone.BATTLEFIELD, source, game); diff --git a/Mage.Sets/src/mage/cards/u/UrzasSylex.java b/Mage.Sets/src/mage/cards/u/UrzasSylex.java index 29d8ef13f64..8ae2b541bb0 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasSylex.java +++ b/Mage.Sets/src/mage/cards/u/UrzasSylex.java @@ -111,7 +111,7 @@ class UrzasSylexEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetPermanent(6, StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); toKeep.addAll(target.getTargets()); } diff --git a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java index 97478084cde..007b231e7f8 100644 --- a/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java +++ b/Mage.Sets/src/mage/cards/v/ValkiGodOfLies.java @@ -122,7 +122,7 @@ class ValkiGodOfLiesRevealExileEffect extends OneShotEffect { opponent.revealCards(source, opponent.getHand(), game); TargetCard targetToExile = new TargetCard(Zone.HAND, StaticFilters.FILTER_CARD_CREATURE); targetToExile.withChooseHint("card to exile"); - targetToExile.setNotTarget(true); + targetToExile.withNotTarget(true); if (opponent.getHand().count(StaticFilters.FILTER_CARD_CREATURE, game) > 0 && controller.choose(Outcome.Exile, opponent.getHand(), targetToExile, source, game)) { Card targetedCardToExile = game.getCard(targetToExile.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java b/Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java index 8e7ae3abf76..af703417c73 100644 --- a/Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java +++ b/Mage.Sets/src/mage/cards/v/VesuvanDoppelganger.java @@ -80,7 +80,7 @@ class VesuvanDoppelgangerCopyEffect extends OneShotEffect { if (source instanceof SimpleStaticAbility) { target = new TargetPermanent(new FilterCreaturePermanent("creature (you copy from)")); target.setRequired(false); - target.setNotTarget(true); + target.withNotTarget(true); } if (target.canChoose(source.getControllerId(), source, game)) { controller.choose(Outcome.Copy, target, source, game); diff --git a/Mage.Sets/src/mage/cards/v/VisionsOfDread.java b/Mage.Sets/src/mage/cards/v/VisionsOfDread.java index 08f27be5072..b0e133d9be3 100644 --- a/Mage.Sets/src/mage/cards/v/VisionsOfDread.java +++ b/Mage.Sets/src/mage/cards/v/VisionsOfDread.java @@ -77,7 +77,7 @@ class VisionsOfDreadEffect extends OneShotEffect { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard( StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD ); - target.setNotTarget(true); + target.withNotTarget(true); opponent.choose(Outcome.Detriment, target, source, game); return controller.moveCards(game.getCard(target.getFirstTarget()), Zone.BATTLEFIELD, source, game); } diff --git a/Mage.Sets/src/mage/cards/v/VisionsOfRuin.java b/Mage.Sets/src/mage/cards/v/VisionsOfRuin.java index f110cb2e886..741661dd3e6 100644 --- a/Mage.Sets/src/mage/cards/v/VisionsOfRuin.java +++ b/Mage.Sets/src/mage/cards/v/VisionsOfRuin.java @@ -78,7 +78,7 @@ class VisionsOfRuinEffect extends OneShotEffect { continue; } TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT); - target.setNotTarget(true); + target.withNotTarget(true); opponent.choose(Outcome.Sacrifice, target, source, game); permanents.add(game.getPermanent(target.getFirstTarget())); } diff --git a/Mage.Sets/src/mage/cards/v/ViviensInvocation.java b/Mage.Sets/src/mage/cards/v/ViviensInvocation.java index 9912699ce2b..037f26f73c9 100644 --- a/Mage.Sets/src/mage/cards/v/ViviensInvocation.java +++ b/Mage.Sets/src/mage/cards/v/ViviensInvocation.java @@ -68,7 +68,7 @@ class ViviensInvocationEffect extends OneShotEffect { return true; } TargetCard target = new TargetCard(Zone.LIBRARY, filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(Outcome.PutCreatureInPlay, cards, target, source, game); Card card = cards.get(target.getFirstTarget(), game); if (card == null) { diff --git a/Mage.Sets/src/mage/cards/v/VoidMaw.java b/Mage.Sets/src/mage/cards/v/VoidMaw.java index bf19a3a1c1d..c10074c8c90 100644 --- a/Mage.Sets/src/mage/cards/v/VoidMaw.java +++ b/Mage.Sets/src/mage/cards/v/VoidMaw.java @@ -136,7 +136,7 @@ class VoidMawCost extends CostImpl { Player controller = game.getPlayer(controllerId); if (controller != null) { TargetCardInExile target = new TargetCardInExile(new FilterCard(), CardUtil.getCardExileZoneId(game, ability)); - target.setNotTarget(true); + target.withNotTarget(true); Cards cards = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, ability)); if (cards != null && !cards.isEmpty() diff --git a/Mage.Sets/src/mage/cards/w/WallOfStolenIdentity.java b/Mage.Sets/src/mage/cards/w/WallOfStolenIdentity.java index 4793b9c534e..31dc3541fd4 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfStolenIdentity.java +++ b/Mage.Sets/src/mage/cards/w/WallOfStolenIdentity.java @@ -92,7 +92,7 @@ class WallOfStolenIdentityCopyEffect extends OneShotEffect { if (source instanceof SimpleStaticAbility) { target = new TargetPermanent(new FilterCreaturePermanent("creature (you copy from)")); target.setRequired(false); - target.setNotTarget(true); + target.withNotTarget(true); } if (!target.canChoose(source.getControllerId(), source, game)) { return false; diff --git a/Mage.Sets/src/mage/cards/w/WanderingMage.java b/Mage.Sets/src/mage/cards/w/WanderingMage.java index f4d326e38e7..928412fc2d1 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingMage.java +++ b/Mage.Sets/src/mage/cards/w/WanderingMage.java @@ -67,7 +67,7 @@ public final class WanderingMage extends CardImpl { ability.addCost(new WanderingMageCost()); ability.addTarget(new TargetPlayerOrPlaneswalker()); Target target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); ability.addTarget(target); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java index c88181b0845..1aeab1d644b 100644 --- a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java +++ b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java @@ -74,7 +74,7 @@ class WarrenWeirdingEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null || !permanent.sacrifice(source, game)) { diff --git a/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java b/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java index 40eb16d14a4..73a51806bb6 100644 --- a/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java +++ b/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java @@ -73,7 +73,7 @@ class WatchersOfTheDeadEffect extends OneShotEffect { if (opponent != null && !opponent.equals(controller)) { TargetCard target = new TargetCardInYourGraveyard(2, 2, new FilterCard()); - target.setNotTarget(true); + target.withNotTarget(true); Cards cardsInGraveyard = opponent.getGraveyard(); if (cardsInGraveyard.size() > 1) { opponent.choose(outcome, cardsInGraveyard, target, source, game); diff --git a/Mage.Sets/src/mage/cards/w/WhitePlumeAdventurer.java b/Mage.Sets/src/mage/cards/w/WhitePlumeAdventurer.java index ee4c2a7ac45..0466db78d19 100644 --- a/Mage.Sets/src/mage/cards/w/WhitePlumeAdventurer.java +++ b/Mage.Sets/src/mage/cards/w/WhitePlumeAdventurer.java @@ -100,7 +100,7 @@ class WhitePlumeAdventurerEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); return permanent != null && permanent.untap(game); diff --git a/Mage.Sets/src/mage/cards/w/WickedSlumber.java b/Mage.Sets/src/mage/cards/w/WickedSlumber.java index 57fe63ec7a2..9e1957f5fa0 100644 --- a/Mage.Sets/src/mage/cards/w/WickedSlumber.java +++ b/Mage.Sets/src/mage/cards/w/WickedSlumber.java @@ -96,7 +96,7 @@ class WickedSlumberEffect extends OneShotEffect { )); for (int i = 0; i < 2; i++) { TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); target.withChooseHint("to add a stun counter to"); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/w/WidespreadPanic.java b/Mage.Sets/src/mage/cards/w/WidespreadPanic.java index 43641bf6f58..50a22eaa65a 100644 --- a/Mage.Sets/src/mage/cards/w/WidespreadPanic.java +++ b/Mage.Sets/src/mage/cards/w/WidespreadPanic.java @@ -97,7 +97,7 @@ class WidespreadPanicEffect extends OneShotEffect { if (shuffler != null) { if (!shuffler.getHand().isEmpty()) { TargetCardInHand target = new TargetCardInHand(); - target.setNotTarget(true); + target.withNotTarget(true); target.setTargetName("a card from your hand to put on top of your library"); shuffler.choose(Outcome.Detriment, target, source, game); Card card = shuffler.getHand().get(target.getFirstTarget(), game); diff --git a/Mage.Sets/src/mage/cards/w/WildfireDevils.java b/Mage.Sets/src/mage/cards/w/WildfireDevils.java index 2b7c0002c13..8ae00a453e3 100644 --- a/Mage.Sets/src/mage/cards/w/WildfireDevils.java +++ b/Mage.Sets/src/mage/cards/w/WildfireDevils.java @@ -86,7 +86,7 @@ class WildfireDevilsEffect extends OneShotEffect { return false; } TargetCardInGraveyard targetCard = new TargetCardInGraveyard(StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); if (!randomPlayer.choose(Outcome.Discard, randomPlayer.getGraveyard(), targetCard, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/w/WishclawTalisman.java b/Mage.Sets/src/mage/cards/w/WishclawTalisman.java index 5d535e65450..9b714024a9e 100644 --- a/Mage.Sets/src/mage/cards/w/WishclawTalisman.java +++ b/Mage.Sets/src/mage/cards/w/WishclawTalisman.java @@ -91,7 +91,7 @@ class WishclawTalismanEffect extends OneShotEffect { return false; } TargetPlayer target = new TargetOpponent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.choose(outcome, target, source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/w/WitherbloomCommand.java b/Mage.Sets/src/mage/cards/w/WitherbloomCommand.java index 36bc8b57ba2..b89b73b5305 100644 --- a/Mage.Sets/src/mage/cards/w/WitherbloomCommand.java +++ b/Mage.Sets/src/mage/cards/w/WitherbloomCommand.java @@ -106,7 +106,7 @@ class WitherbloomCommandEffect extends OneShotEffect { return false; } TargetCard target = new TargetCardInYourGraveyard(1, StaticFilters.FILTER_CARD_LAND); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return false; } diff --git a/Mage.Sets/src/mage/cards/w/WoebringerDemon.java b/Mage.Sets/src/mage/cards/w/WoebringerDemon.java index 81584563723..7c587cbee98 100644 --- a/Mage.Sets/src/mage/cards/w/WoebringerDemon.java +++ b/Mage.Sets/src/mage/cards/w/WoebringerDemon.java @@ -74,7 +74,7 @@ class WoebringerDemonEffect extends OneShotEffect { Player currentPlayer = game.getPlayer(getTargetPointer().getFirst(game, source)); if (currentPlayer != null) { TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(currentPlayer.getId(), source, game)) { currentPlayer.chooseTarget(Outcome.Sacrifice, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage.Sets/src/mage/cards/w/WorldQueller.java b/Mage.Sets/src/mage/cards/w/WorldQueller.java index 90288aed81d..e41c1288e48 100644 --- a/Mage.Sets/src/mage/cards/w/WorldQueller.java +++ b/Mage.Sets/src/mage/cards/w/WorldQueller.java @@ -114,7 +114,7 @@ class WorldQuellerEffect extends OneShotEffect { filter.add(type.getPredicate()); TargetPermanent target = new TargetControlledPermanent(1, 1, filter, false); - target.setNotTarget(true); + target.withNotTarget(true); for (UUID playerId : game.getState().getPlayersInRange(source.getControllerId(), game)) { Player player2 = game.getPlayer(playerId); diff --git a/Mage.Sets/src/mage/cards/w/WormfangCrab.java b/Mage.Sets/src/mage/cards/w/WormfangCrab.java index 61ea73909b3..7c8d052ca3f 100644 --- a/Mage.Sets/src/mage/cards/w/WormfangCrab.java +++ b/Mage.Sets/src/mage/cards/w/WormfangCrab.java @@ -89,7 +89,7 @@ class WormfangCrabExileEffect extends OneShotEffect { filter.add(AnotherPredicate.instance); filter.add(new ControllerIdPredicate(controller.getId())); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); target.setTargetName("a permanent that player controls"); if (!opponent.choose(outcome, target, source, game)) { return false; diff --git a/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java b/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java index 863179c638e..d8e4bbfd5f4 100644 --- a/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java +++ b/Mage.Sets/src/mage/cards/x/XenagosTheReveler.java @@ -121,7 +121,7 @@ class XenagosExileEffect extends OneShotEffect { filter.add(Predicates.or(CardType.CREATURE.getPredicate(), CardType.LAND.getPredicate())); TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.EXILED, filter); - target1.setNotTarget(true); + target1.withNotTarget(true); if (!exiledCards.isEmpty() && target1.canChoose(source.getControllerId(), source, game) && controller.choose(Outcome.PutCardInPlay, exiledCards, target1, source, game)) { diff --git a/Mage.Sets/src/mage/cards/y/YannikScavengingSentinel.java b/Mage.Sets/src/mage/cards/y/YannikScavengingSentinel.java index 6697a256623..1bcfeadfce7 100644 --- a/Mage.Sets/src/mage/cards/y/YannikScavengingSentinel.java +++ b/Mage.Sets/src/mage/cards/y/YannikScavengingSentinel.java @@ -86,7 +86,7 @@ class YannikScavengingSentinelEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage.Sets/src/mage/cards/y/YouFindSomePrisoners.java b/Mage.Sets/src/mage/cards/y/YouFindSomePrisoners.java index 2af56bbe731..795494a8dc3 100644 --- a/Mage.Sets/src/mage/cards/y/YouFindSomePrisoners.java +++ b/Mage.Sets/src/mage/cards/y/YouFindSomePrisoners.java @@ -77,7 +77,7 @@ class YouFindSomePrisonersEffect extends OneShotEffect { Cards cards = new CardsImpl(opponent.getLibrary().getTopCards(game, 3)); player.moveCards(cards, Zone.EXILED, source, game); TargetCardInExile target = new TargetCardInExile(StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.PlayForFree, cards, target, source, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { diff --git a/Mage.Sets/src/mage/cards/z/ZaraRenegadeRecruiter.java b/Mage.Sets/src/mage/cards/z/ZaraRenegadeRecruiter.java index f6d6f01a552..424f7df9480 100644 --- a/Mage.Sets/src/mage/cards/z/ZaraRenegadeRecruiter.java +++ b/Mage.Sets/src/mage/cards/z/ZaraRenegadeRecruiter.java @@ -111,7 +111,7 @@ class ZaraRenegadeRecruiterEffect extends OneShotEffect { filter.getPlayerFilter().add(new PlayerIdPredicate(player.getId())); filter.getPermanentFilter().add(new ControllerIdPredicate(player.getId())); TargetPlayerOrPlaneswalker target = new TargetPlayerOrPlaneswalker(filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); defenderId = target.getFirstTarget(); } diff --git a/Mage.Sets/src/mage/cards/z/ZevlorElturelExile.java b/Mage.Sets/src/mage/cards/z/ZevlorElturelExile.java index 2f105f1bb50..82a3c492bbd 100644 --- a/Mage.Sets/src/mage/cards/z/ZevlorElturelExile.java +++ b/Mage.Sets/src/mage/cards/z/ZevlorElturelExile.java @@ -182,7 +182,7 @@ class ZevlorElturelExileEffect extends CopySpellForEachItCouldTargetEffect { FilterPermanent filter = new FilterPermanent("Permanent to target"); filter.add(Predicates.or(targetAb.stream().map(PermanentIdPredicate::new).collect(Collectors.toSet()))); TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(outcome, target, source, game); predicates.add(new MageObjectReferencePredicate(target.getFirstTarget(), game)); } diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java index 36320167773..97c5db43e3f 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileFromGraveCost.java @@ -28,7 +28,7 @@ public class ExileFromGraveCost extends CostImpl { private boolean setTargetPointer = false; public ExileFromGraveCost(TargetCardInYourGraveyard target) { - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); if (target.getMaxNumberOfTargets() > 1) { this.text = "exile " @@ -46,19 +46,19 @@ public class ExileFromGraveCost extends CostImpl { } public ExileFromGraveCost(TargetCardInYourGraveyard target, String text) { - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); this.text = text; } public ExileFromGraveCost(TargetCardInASingleGraveyard target, String text) { - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); this.text = text; } public ExileFromGraveCost(TargetCardInASingleGraveyard target) { - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); this.text = "exile " + target.getDescription(); } diff --git a/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java index 4f977dde7ef..e2161bdc426 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ExileTargetCost.java @@ -26,7 +26,7 @@ public class ExileTargetCost extends CostImpl { List permanents = new ArrayList<>(); public ExileTargetCost(TargetControlledPermanent target) { - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); this.text = "exile " + target.getDescription(); } diff --git a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java index d79614c6af7..639ca25d24d 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/ReturnToHandChosenControlledPermanentCost.java @@ -23,7 +23,7 @@ import java.util.UUID; public class ReturnToHandChosenControlledPermanentCost extends CostImpl { public ReturnToHandChosenControlledPermanentCost(TargetControlledPermanent target) { - target.setNotTarget(true); + target.withNotTarget(true); this.addTarget(target); if (target.getMaxNumberOfTargets() > 1 && target.getMaxNumberOfTargets() == target.getNumberOfTargets()) { this.text = "return " + CardUtil.numberToText(target.getMaxNumberOfTargets()) + ' ' diff --git a/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java index e79f995a49f..d9e2d765cb3 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/SacrificeTargetCost.java @@ -30,7 +30,7 @@ public class SacrificeTargetCost extends CostImpl implements SacrificeCost { public SacrificeTargetCost(TargetControlledPermanent target) { this.addTarget(target); - target.setNotTarget(true); // sacrifice is never targeted + target.withNotTarget(true); // sacrifice is never targeted target.setRequired(false); // can be canceled this.text = "sacrifice " + makeText(target); target.setTargetName(target.getTargetName() + " (to sacrifice)"); diff --git a/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java index e06291ddd39..4a5e1b3d4b4 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/TapTargetCost.java @@ -22,7 +22,7 @@ public class TapTargetCost extends CostImpl { public TapTargetCost(TargetControlledPermanent target) { this.target = target; - this.target.setNotTarget(true); // costs are never targeted + this.target.withNotTarget(true); // costs are never targeted this.target.setRequired(false); // can be cancel by user this.text = "tap " + (target.getNumberOfTargets() > 1 ? CardUtil.numberToText(target.getMaxNumberOfTargets()) + ' ' + target.getTargetName() diff --git a/Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java b/Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java index 42684d54aee..75f498e9705 100644 --- a/Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java +++ b/Mage/src/main/java/mage/abilities/costs/common/UntapTargetCost.java @@ -25,7 +25,7 @@ public class UntapTargetCost extends CostImpl { this.text = makeText(target); // It will never target as part of a cost - this.target.setNotTarget(true); + this.target.withNotTarget(true); } protected UntapTargetCost(final UntapTargetCost cost) { diff --git a/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java index 30c7a4fdc41..c7cc6b337da 100644 --- a/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/AuraReplacementEffect.java @@ -112,7 +112,7 @@ public class AuraReplacementEffect extends ReplacementEffectImpl { enchantCardInGraveyard = target instanceof TargetCardInGraveyard; if (target != null) { target.withChooseHint("to attach " + card.getName() + " to"); - target.setNotTarget(true); // always not target because this way it's not handled targeted + target.withNotTarget(true); // always not target because this way it's not handled targeted target.clearChosen(); // necessary if e.g. aura is blinked multiple times } diff --git a/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java index 4125f3693ec..8e695c451ab 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java @@ -65,7 +65,7 @@ public class CipherEffect extends OneShotEffect { Player controller = game.getPlayer(source.getControllerId()); if (controller != null) { TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(source.getControllerId(), source, game) && controller.chooseUse(outcome, "Cipher this spell to a creature?", source, game)) { controller.chooseTarget(outcome, target, source, game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java index 941267142ab..21ac15829e4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CopyPermanentEffect.java @@ -90,7 +90,7 @@ public class CopyPermanentEffect extends OneShotEffect { copyFromPermanent = game.getPermanent(getTargetPointer().getFirst(game, source)); } else { Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game)) { controller.choose(Outcome.Copy, target, source, game); copyFromPermanent = game.getPermanent(target.getFirstTarget()); @@ -156,7 +156,7 @@ public class CopyPermanentEffect extends OneShotEffect { } // select new target - auraTarget.setNotTarget(true); + auraTarget.withNotTarget(true); if (!controller.choose(auraOutcome, auraTarget, source, game)) { return true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardOneOfThemEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardOneOfThemEffect.java index 15b89586eee..c5fb4696027 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardOneOfThemEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardOneOfThemEffect.java @@ -50,7 +50,7 @@ public class DrawDiscardOneOfThemEffect extends OneShotEffect { drawnCards.removeAll(initialHand); if (!drawnCards.isEmpty()) { TargetCard cardToDiscard = new TargetCard(Zone.HAND, new FilterCard("card to discard")); - cardToDiscard.setNotTarget(true); + cardToDiscard.withNotTarget(true); if (controller.choose(Outcome.Discard, drawnCards, cardToDiscard, source, game)) { Card card = controller.getHand().get(cardToDiscard.getFirstTarget(), game); if (card != null) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java index f48e2df03d8..643864d3466 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EntersBattlefieldUnderControlOfOpponentOfChoiceEffect.java @@ -41,7 +41,7 @@ public class EntersBattlefieldUnderControlOfOpponentOfChoiceEffect extends OneSh return false; } Target target = new TargetOpponent(); - target.setNotTarget(true); + target.withNotTarget(true); if (!controller.choose(Outcome.Benefit, target, source, game)) { return false; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java index 74d7260b6ef..79beb11c00a 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ExileCardFromOwnGraveyardControllerEffect.java @@ -46,7 +46,7 @@ public class ExileCardFromOwnGraveyardControllerEffect extends OneShotEffect { TargetCardInYourGraveyard target = new TargetCardInYourGraveyard(Math.min( amount, player.getGraveyard().size() ), StaticFilters.FILTER_CARD); - target.setNotTarget(true); + target.withNotTarget(true); if (!player.chooseTarget(outcome, target, source, game)) { return true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java index 43336400b8f..e0bfbafdf1c 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/MeldEffect.java @@ -77,7 +77,7 @@ public class MeldEffect extends OneShotEffect { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Permanent meldWithPermanent = game.getPermanent(target.getFirstTarget()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java index 2785ac5865e..95f02bb6765 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/PopulateEffect.java @@ -70,7 +70,7 @@ public class PopulateEffect extends OneShotEffect { return false; } Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java b/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java index 29de08c3489..b9b8d3793b6 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/WishEffect.java @@ -124,7 +124,7 @@ public class WishEffect extends OneShotEffect { } TargetCard target = new TargetCard(Zone.ALL, filter); - target.setNotTarget(true); + target.withNotTarget(true); if (controller.choose(Outcome.Benefit, filteredCards, target, source, game)) { Card card = controller.getSideboard().get(target.getFirstTarget(), game); if (card == null && alsoFromExile) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java index d11c024de78..a7fca9f5ea2 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java @@ -106,7 +106,7 @@ public class DiscardCardYouChooseTargetEffect extends OneShotEffect { if (player.getHand().size() > numberToReveal) { TargetCard chosenCards = new TargetCard(numberToReveal, numberToReveal, Zone.HAND, new FilterCard("card in " + player.getName() + "'s hand")); - chosenCards.setNotTarget(true); + chosenCards.withNotTarget(true); if (chosenCards.canChoose(player.getId(), source, game) && player.chooseTarget(Outcome.Discard, player.getHand(), chosenCards, source, game)) { if (!chosenCards.getTargets().isEmpty()) { diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java index 325d042c4ad..bff4df651c9 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/AmassEffect.java @@ -100,7 +100,7 @@ public class AmassEffect extends OneShotEffect { makeToken(subType).putOntoBattlefield(1, game, source); } Target target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.BoostCreature, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null) { diff --git a/Mage/src/main/java/mage/abilities/keyword/EnlistAbility.java b/Mage/src/main/java/mage/abilities/keyword/EnlistAbility.java index d56cf9b2d44..a4db67e6bf2 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EnlistAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EnlistAbility.java @@ -92,7 +92,7 @@ class EnlistEffect extends ReplacementEffectImpl { return false; } TargetPermanent target = new TargetPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(outcome, target, source, game); Permanent permanent = game.getPermanent(target.getFirstTarget()); if (permanent == null || !permanent.tap(source, game)) { diff --git a/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java index dafb0c0fb9c..5e08f7bef1a 100644 --- a/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/HideawayAbility.java @@ -92,7 +92,7 @@ class HideawayExileEffect extends OneShotEffect { return true; } TargetCard target = new TargetCard(Zone.LIBRARY, filter); - target.setNotTarget(true); + target.withNotTarget(true); controller.choose(Outcome.Detriment, cards, target, source, game); Card card = cards.get(target.getFirstTarget(), game); if (card != null) { diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java index c9d2faa52b4..e039263201d 100644 --- a/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java @@ -135,7 +135,7 @@ class SoulboundEntersSelfEffect extends OneShotEffect { Player controller = game.getPlayer(permanent.getControllerId()); if (controller != null) { TargetControlledPermanent target = new TargetControlledPermanent(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (target.canChoose(controller.getId(), source, game)) { if (controller.choose(Outcome.Benefit, target, source, game)) { Permanent chosen = game.getPermanent(target.getFirstTarget()); diff --git a/Mage/src/main/java/mage/game/GameCommanderImpl.java b/Mage/src/main/java/mage/game/GameCommanderImpl.java index 15ce35da0ec..d683e83896a 100644 --- a/Mage/src/main/java/mage/game/GameCommanderImpl.java +++ b/Mage/src/main/java/mage/game/GameCommanderImpl.java @@ -171,7 +171,7 @@ public abstract class GameCommanderImpl extends GameImpl { // Paris mulligan - no longer used by default for commander // Player player = getPlayer(playerId); // TargetCardInHand target = new TargetCardInHand(1, player.getHand().size(), new FilterCard("card to mulligan")); -// target.setNotTarget(true); +// target.withNotTarget(true); // target.setRequired(false); // if (player.choose(Outcome.Exile, player.getHand(), target, this)) { // int numCards = target.getTargets().size(); diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index df6f4748231..17cb7312a11 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -2688,7 +2688,7 @@ public abstract class GameImpl implements Game { continue; } Target targetLegendaryToKeep = new TargetPermanent(filterLegendName); - targetLegendaryToKeep.setNotTarget(true); + targetLegendaryToKeep.withNotTarget(true); targetLegendaryToKeep.setTargetName(legend.getName() + " to keep (Legendary Rule)?"); controller.choose(Outcome.Benefit, targetLegendaryToKeep, null, this); for (Permanent dupLegend : getBattlefield().getActivePermanents(filterLegendName, legend.getControllerId(), this)) { diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index 6c1c0cd50bc..c901c9177eb 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -1701,7 +1701,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { Player newProtector; if (opponents.size() > 1) { TargetPlayer target = new TargetPlayer(new FilterOpponent("protector for " + getName())); - target.setNotTarget(true); + target.withNotTarget(true); target.setRequired(true); controller.choose(Outcome.Neutral, target, source, game); newProtector = game.getPlayer(target.getFirstTarget()); diff --git a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java index 0691bcc8d59..15fd222d38d 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SengirNosferatuBatToken.java @@ -80,7 +80,7 @@ class ReturnSengirNosferatuEffect extends OneShotEffect { return false; } Target target = new TargetCardInExile(filter); - target.setNotTarget(true); + target.withNotTarget(true); if (!target.canChoose(source.getControllerId(), source, game)) { return false; } diff --git a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java index 7763f3d48c3..3d390323cfd 100644 --- a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java +++ b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java @@ -379,7 +379,7 @@ public abstract class TokenImpl extends MageObjectImpl implements Token { } // select new target - auraTarget.setNotTarget(true); + auraTarget.withNotTarget(true); if (!controller.choose(auraOutcome, auraTarget, source, game)) { break; } diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index bfb535f05c8..ee32160b4a2 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -2776,7 +2776,7 @@ public abstract class PlayerImpl implements Player, Serializable { boolean casted = false; TargetCard targetCard = new TargetCard(0, 1, Zone.LIBRARY, StaticFilters.FILTER_CARD); targetCard.setTargetName("card to cast from library"); - targetCard.setNotTarget(true); + targetCard.withNotTarget(true); while (!castableCards.isEmpty()) { targetCard.clearChosen(); if (!targetPlayer.choose(Outcome.AIDontUseIt, new CardsImpl(castableCards), targetCard, source, game)) { @@ -5194,7 +5194,7 @@ public abstract class PlayerImpl implements Player, Serializable { if (choosing) { TargetPermanent target = new TargetControlledCreaturePermanent(); - target.setNotTarget(true); + target.withNotTarget(true); target.withChooseHint("to be your Ring-bearer"); choose(Outcome.Neutral, target, null, game); diff --git a/Mage/src/main/java/mage/target/Target.java b/Mage/src/main/java/mage/target/Target.java index 89e27831e26..882a0314d40 100644 --- a/Mage/src/main/java/mage/target/Target.java +++ b/Mage/src/main/java/mage/target/Target.java @@ -28,12 +28,17 @@ public interface Target extends Serializable { boolean isNotTarget(); /** - * controls if it will be checked, if the target can be targeted from source + * Mark it as non target (e.g. card's rules do not contain a "target" word) + *

+ * Non targeted abilities are unaffected by protection/hexproof and other target related effects + * Non targeted spells can't be fizzled on resolve with invalid targets + * Non targeted spells chooses targets on resolve, targeted spells chooses targets on activate + * All costs must be non targeted * - * @param notTarget true = do not check for protection, false = check for - * protection + * @param notTarget + * @return */ - void setNotTarget(boolean notTarget); + Target withNotTarget(boolean notTarget); // methods for targets boolean canChoose(UUID sourceControllerId, Ability source, Game game); @@ -181,7 +186,6 @@ public interface Target extends Serializable { * - The minimum and maximum number of targets is the same (i.e. effect does not have "up to" in its name) * - The number of valid targets is equal to the number of targets still left to be specified * - * * @param abilityControllerId * @param source * @param game diff --git a/Mage/src/main/java/mage/target/TargetImpl.java b/Mage/src/main/java/mage/target/TargetImpl.java index fa2e8be7a99..28376250e2e 100644 --- a/Mage/src/main/java/mage/target/TargetImpl.java +++ b/Mage/src/main/java/mage/target/TargetImpl.java @@ -546,8 +546,9 @@ public abstract class TargetImpl implements Target { } @Override - public void setNotTarget(boolean notTarget) { + public TargetImpl withNotTarget(boolean notTarget) { this.notTarget = notTarget; + return this; } @Override diff --git a/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java index 4ca7aa4eedf..cc8d2980f98 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInGraveyard.java @@ -38,7 +38,7 @@ public class TargetCardInGraveyard extends TargetCard { public TargetCardInGraveyard(int minNumTargets, int maxNumTargets, FilterCard filter, boolean notTarget) { super(minNumTargets, maxNumTargets, Zone.GRAVEYARD, filter); - this.setNotTarget(notTarget); + this.withNotTarget(notTarget); } protected TargetCardInGraveyard(final TargetCardInGraveyard target) { diff --git a/Mage/src/main/java/mage/target/common/TargetCardInHand.java b/Mage/src/main/java/mage/target/common/TargetCardInHand.java index 89a45f13a10..25dd47d6bb1 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInHand.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInHand.java @@ -34,7 +34,7 @@ public class TargetCardInHand extends TargetCard { public TargetCardInHand(int minNumTargets, int maxNumTargets, FilterCard filter) { super(minNumTargets, maxNumTargets, Zone.HAND, filter); - setNotTarget(true); + withNotTarget(true); } protected TargetCardInHand(final TargetCardInHand target) { diff --git a/Mage/src/main/java/mage/target/common/TargetCardInLibrary.java b/Mage/src/main/java/mage/target/common/TargetCardInLibrary.java index 20dc97d608b..75908154a8a 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInLibrary.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInLibrary.java @@ -45,7 +45,7 @@ public class TargetCardInLibrary extends TargetCard { // with a certain card type or color, that player isn't required to find some or all of those cards // even if they're present in that zone. this.setRequired(!filter.hasPredicates()); - this.setNotTarget(true); + this.withNotTarget(true); this.librarySearchLimit = Integer.MAX_VALUE; } diff --git a/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java b/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java index 8444af730d0..5920ba3717d 100644 --- a/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java +++ b/Mage/src/main/java/mage/target/common/TargetCardInYourGraveyard.java @@ -46,7 +46,7 @@ public class TargetCardInYourGraveyard extends TargetCard { public TargetCardInYourGraveyard(int minNumTarget, int maxNumTargets, FilterCard filter, boolean notTarget) { super(minNumTarget, maxNumTargets, Zone.GRAVEYARD, filter); - this.setNotTarget(notTarget); + this.withNotTarget(notTarget); } protected TargetCardInYourGraveyard(final TargetCardInYourGraveyard target) { diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index a83d8327ae9..87741da9a9e 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -1288,7 +1288,7 @@ public final class CardUtil { default: Cards castableCards = new CardsImpl(cardMap.keySet()); TargetCard target = new TargetCard(0, 1, Zone.ALL, defaultFilter); - target.setNotTarget(true); + target.withNotTarget(true); player.choose(Outcome.PlayForFree, castableCards, target, source, game); cardToCast = castableCards.get(target.getFirstTarget(), game); }