Remove explicit set of required property in constructor

Mage.Sets/src/mage/sets/alarareborn/Anathemancer.java

@@ -64,7 +64,7 @@ public class Anathemancer extends CardImpl {
 
         // When Anathemancer enters the battlefield, it deals damage to target player equal to the number of nonbasic lands that player controls.
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(new AnathemancerCount()));
-        ability.addTarget(new TargetPlayer(true));
+        ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
         // Unearth {5}{B}{R}
         this.addAbility(new UnearthAbility(new ManaCostsImpl("{5}{B}{R}")));

Mage.Sets/src/mage/sets/alarareborn/ArchitectsOfWill.java

@@ -67,7 +67,7 @@ public class ArchitectsOfWill extends CardImpl {
 
         // When Architects of Will enters the battlefield, look at the top three cards of target player's library, then put them back in any order.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ArchitectsOfWillEffect(), false);
-        ability.addTarget(new TargetPlayer(true));
+        ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
 
         // Cycling {UB}

Mage.Sets/src/mage/sets/alarareborn/AvenMimeomancer.java

@@ -67,7 +67,7 @@ public class AvenMimeomancer extends CardImpl {
 
         // At the beginning of your upkeep, you may put a feather counter on target creature. If you do, that creature is 3/1 and has flying for as long as it has a feather counter on it.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FEATHER.createInstance()), TargetController.YOU, true);
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         ability.addEffect(new AvenEffect());
         ability.addEffect(new AvenEffect2());
         this.addAbility(ability);

Mage.Sets/src/mage/sets/alarareborn/BituminousBlast.java

@@ -47,7 +47,7 @@ public class BituminousBlast extends CardImpl {
         this.expansionSetCode = "ARB";
         this.color.setBlack(true);
         this.color.setRed(true);
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new DamageTargetEffect(4));
         this.addAbility(new CascadeAbility());
     }

Mage.Sets/src/mage/sets/alarareborn/Brainbite.java

@@ -52,7 +52,7 @@ public class Brainbite extends CardImpl {
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect());
         // Draw a card.
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
-        this.getSpellAbility().addTarget(new TargetOpponent(true));
+        this.getSpellAbility().addTarget(new TargetOpponent());
     }
 
     public Brainbite(final Brainbite card) {

Mage.Sets/src/mage/sets/alarareborn/ColossalMight.java

@@ -49,7 +49,7 @@ public class ColossalMight extends CardImpl {
         this.expansionSetCode = "ARB";
         this.color.setRed(true);
         this.color.setGreen(true);
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new BoostTargetEffect(4, 2, Duration.EndOfTurn));
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn));
     }

Mage.Sets/src/mage/sets/alarareborn/Crystallization.java

@@ -64,7 +64,7 @@ public class Crystallization extends CardImpl {
         this.color.setWhite(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java

@@ -66,7 +66,7 @@ public class DeadshotMinotaur extends CardImpl {
 
         // When Deadshot Minotaur enters the battlefield, it deals 3 damage to target creature with flying.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3), false);
-        ability.addTarget(new TargetCreaturePermanent(filter, true));
+        ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
         // Cycling {RG}
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{R/G}")));

Mage.Sets/src/mage/sets/alarareborn/DemonicDread.java

@@ -55,7 +55,7 @@ public class DemonicDread extends CardImpl {
         this.addAbility(new CascadeAbility());
 
         // Target creature can't block this turn.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn));
 
     }

Mage.Sets/src/mage/sets/alarareborn/DenyReality.java

@@ -47,7 +47,7 @@ public class DenyReality extends CardImpl {
         this.expansionSetCode = "ARB";
         this.color.setBlue(true);
         this.color.setBlack(true);
-        this.getSpellAbility().addTarget(new TargetPermanent(true));
+        this.getSpellAbility().addTarget(new TargetPermanent());
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
         this.addAbility(new CascadeAbility());
     }

Mage.Sets/src/mage/sets/alarareborn/EsperSojourners.java

@@ -61,8 +61,8 @@ public class EsperSojourners extends CardImpl {
         // When you cycle Esper Sojourners or it dies, you may tap or untap target permanent.
         Ability ability1 = new CycleTriggeredAbility(new MayTapOrUntapTargetEffect());
         Ability ability2 = new DiesTriggeredAbility(new MayTapOrUntapTargetEffect());
-        ability1.addTarget(new TargetPermanent(true));
+        ability1.addTarget(new TargetPermanent());
-        ability2.addTarget(new TargetPermanent(true));
+        ability2.addTarget(new TargetPermanent());
         this.addAbility(ability1);
         this.addAbility(ability2);
         

Mage.Sets/src/mage/sets/alarareborn/GiantAmbushBeetle.java

@@ -61,7 +61,7 @@ public class GiantAmbushBeetle extends CardImpl {
         
         // When Giant Ambush Beetle enters the battlefield, you may have target creature block it this turn if able.
         Ability ability = new EntersBattlefieldTriggeredAbility(new MustBeBlockedByTargetSourceEffect(Duration.EndOfTurn), true);
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/alarareborn/IdentityCrisis.java

@@ -53,7 +53,7 @@ public class IdentityCrisis extends CardImpl {
         this.color.setWhite(true);
         this.color.setBlack(true);
         this.getSpellAbility().addEffect(new IdentityCrisisEffect());
-        this.getSpellAbility().addTarget(new TargetPlayer(true));
+        this.getSpellAbility().addTarget(new TargetPlayer());
     }
 
     public IdentityCrisis (final IdentityCrisis card) {

Mage.Sets/src/mage/sets/alarareborn/IntimidationBolt.java

@@ -55,7 +55,7 @@ public class IntimidationBolt extends CardImpl {
         // Intimidation Bolt deals 3 damage to target creature. Other creatures can't attack this turn.
         this.getSpellAbility().addEffect(new DamageTargetEffect(3));
         this.getSpellAbility().addEffect(new IntimidationEffect(Duration.EndOfTurn));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         
     }
 

Mage.Sets/src/mage/sets/alarareborn/Lavalanche.java

@@ -61,7 +61,7 @@ public class Lavalanche extends CardImpl {
 
         // Lavalanche deals X damage to target player and each creature he or she controls.
         this.getSpellAbility().addEffect(new LavalancheEffect(new ManacostVariableValue()));
-        this.getSpellAbility().addTarget(new TargetPlayer(true));
+        this.getSpellAbility().addTarget(new TargetPlayer());
         
     }
 

Mage.Sets/src/mage/sets/alarareborn/LichLordOfUnx.java

@@ -75,7 +75,7 @@ public class LichLordOfUnx extends CardImpl {
         this.addAbility(ability);
         ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl("{U}{U}{B}{B}"));
         ability.addEffect(new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter, 1)));
-        ability.addTarget(new TargetPlayer(true));
+        ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/alarareborn/MageSlayer.java

@@ -59,7 +59,7 @@ public class MageSlayer extends CardImpl {
         this.addAbility(new AttacksAttachedTriggeredAbility(new MageSlayerEffect(), false));
 
         // Equip {3}
-        this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(3), new TargetControlledCreaturePermanent(true)));
+        this.addAbility(new EquipAbility(Outcome.Benefit, new GenericManaCost(3), new TargetControlledCreaturePermanent()));
 
     }
 

Mage.Sets/src/mage/sets/alarareborn/MagefireWings.java

@@ -60,7 +60,7 @@ public class MagefireWings extends CardImpl {
         this.color.setBlue(true);
         this.color.setRed(true);
 
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/alarareborn/MindFuneral.java

@@ -57,7 +57,7 @@ public class MindFuneral extends CardImpl {
 
         // Target opponent reveals cards from the top of his or her library until four land cards are revealed. That player puts all cards revealed this way into his or her graveyard.
         this.getSpellAbility().addEffect(new MindFuneralEffect());
-        this.getSpellAbility().addTarget(new TargetOpponent(true));
+        this.getSpellAbility().addTarget(new TargetOpponent());
         
     }
 

Mage.Sets/src/mage/sets/alarareborn/NayaSojourners.java

@@ -62,8 +62,8 @@ public class NayaSojourners extends CardImpl {
         // When you cycle Naya Sojourners or it dies, you may put a +1/+1 counter on target creature.
         Ability ability1 = new CycleTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()));
         Ability ability2 = new DiesTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()));
-        ability1.addTarget(new TargetCreaturePermanent(true));
+        ability1.addTarget(new TargetCreaturePermanent());
-        ability2.addTarget(new TargetCreaturePermanent(true));
+        ability2.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability1);
         this.addAbility(ability2);
         

Mage.Sets/src/mage/sets/alarareborn/NecromancersCovenant.java

@@ -70,7 +70,7 @@ public class NecromancersCovenant extends CardImpl {
 
         // When Necromancer's Covenant enters the battlefield, exile all creature cards from target player's graveyard, then put a 2/2 black Zombie creature token onto the battlefield for each card exiled this way.
         Ability ability = new EntersBattlefieldTriggeredAbility(new NecromancersConvenantEffect(), false);
-        ability.addTarget(new TargetPlayer(true));
+        ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
 
         // Zombies you control have lifelink.

Mage.Sets/src/mage/sets/alarareborn/NulltreadGargantuan.java

@@ -54,7 +54,7 @@ public class NulltreadGargantuan extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(6);
         Ability ability = new EntersBattlefieldTriggeredAbility(new PutOnLibraryTargetEffect(true), false);
-        Target target = new TargetControlledCreaturePermanent(true);
+        Target target = new TargetControlledCreaturePermanent();
         target.setRequired(true);
         target.setNotTarget(true);
         ability.addTarget(target);

Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java

@@ -76,7 +76,7 @@ public class QasaliPridemage extends CardImpl {
         // {1}, Sacrifice Qasali Pridemage: Destroy target artifact or enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}"));
         ability.addCost(new SacrificeSourceCost());
-        Target target = new TargetPermanent(filter, true);
+        Target target = new TargetPermanent(filter);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);

Mage.Sets/src/mage/sets/alarareborn/SangriteBacklash.java

@@ -57,7 +57,7 @@ public class SangriteBacklash extends CardImpl {
         this.color.setBlack(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/alarareborn/SanityGnawers.java

@@ -55,7 +55,7 @@ public class SanityGnawers extends CardImpl {
 
         // When Sanity Gnawers enters the battlefield, target player discards a card at random.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(1, true), false);
-        ability.addTarget(new TargetPlayer(true));
+        ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
         
     }

Mage.Sets/src/mage/sets/alarareborn/ShieldOfTheRighteous.java

@@ -66,7 +66,7 @@ public class ShieldOfTheRighteous extends CardImpl {
         this.addAbility(new BlocksCreatureAttachedTriggeredAbility(new SkipNextUntapTargetEffect("that creature"), "equipped", false, false, true));
         
         // Equip {2}
-        this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent(true)));
+        this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent()));
     }
 
     public ShieldOfTheRighteous(final ShieldOfTheRighteous card) {

Mage.Sets/src/mage/sets/alarareborn/SigilOfTheNayanGods.java

@@ -61,7 +61,7 @@ public class SigilOfTheNayanGods extends CardImpl {
         this.color.setGreen(true);
         this.color.setWhite(true);
 
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         this.addAbility(new EnchantAbility(auraTarget.getTargetName()));

Mage.Sets/src/mage/sets/alarareborn/SingeMindOgre.java

@@ -62,7 +62,7 @@ public class SingeMindOgre extends CardImpl {
 
         // When Singe-Mind Ogre enters the battlefield, target player reveals a card at random from his or her hand, then loses life equal to that card's converted mana cost.
         Ability ability = new EntersBattlefieldTriggeredAbility(new SingeMindOgreEffect(), false);
-        ability.addTarget(new TargetPlayer(true));
+        ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
         
     }

Mage.Sets/src/mage/sets/alarareborn/SlaveOfBolas.java

@@ -65,7 +65,7 @@ public class SlaveOfBolas extends CardImpl {
         this.getSpellAbility().addEffect(new UntapTargetEffect());
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
         this.getSpellAbility().addEffect(new SlaveOfBolasEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
     public SlaveOfBolas(final SlaveOfBolas card) {

Mage.Sets/src/mage/sets/alarareborn/StunSniper.java

@@ -60,7 +60,7 @@ public class StunSniper extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new GenericManaCost(1));
         ability.addCost(new TapSourceCost());
         ability.addEffect(new TapTargetEffect());
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/alarareborn/Terminate.java

@@ -48,7 +48,7 @@ public class Terminate extends CardImpl {
         this.color.setRed(true);
 
         // Destroy target creature. It can't be regenerated.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
     }
 

Mage.Sets/src/mage/sets/alarareborn/ThoughtHemorrhage.java

@@ -56,7 +56,7 @@ public class ThoughtHemorrhage extends CardImpl {
         this.color.setBlack(true);
 
         // Name a nonland card. Target player reveals his or her hand. Thought Hemorrhage deals 3 damage to that player for each card with that name revealed this way. Search that player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles his or her library.
-        this.getSpellAbility().addTarget(new TargetPlayer(true));
+        this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new ThoughtHemorrhageEffect());
     }
 

Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java

@@ -65,7 +65,7 @@ public class UnbenderTine extends CardImpl {
 
         // {tap}: Untap another target permanent.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnbenderTineEffect(), new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter, true));
+        ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java

@@ -83,7 +83,7 @@ public class UnscytheKillerOfKings extends CardImpl {
         this.addWatcher(new EquippedDidDamageWatcher());
 
         // Equip {2}
-        this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent(true)));
+        this.addAbility(new EquipAbility(Outcome.AddAbility, new GenericManaCost(2), new TargetControlledCreaturePermanent()));
     }
 
     public UnscytheKillerOfKings(final UnscytheKillerOfKings card) {

Mage.Sets/src/mage/sets/alarareborn/VectisDominator.java

@@ -66,7 +66,7 @@ public class VectisDominator extends CardImpl {
         // {tap}: Tap target creature unless its controller pays 2 life.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VectisDominatorEffect(new PayLifeCost(2)), new ManaCostsImpl("{1}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/alarareborn/VengefulRebirth.java

@@ -60,7 +60,7 @@ public class VengefulRebirth extends CardImpl {
         Target target = new TargetCardInYourGraveyard();
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
-        this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true));
+        this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
         this.getSpellAbility().addEffect(new VengefulRebirthEffect());
         // Exile Vengeful Rebirth.
         this.getSpellAbility().addEffect(ExileSpellEffect.getInstance());

Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java

@@ -61,7 +61,7 @@ public class VithianRenegades extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
-        ability.addTarget(new TargetPermanent(filter, true));
+        ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/alliances/Exile.java

@@ -66,7 +66,7 @@ public class Exile extends CardImpl {
         this.color.setWhite(true);
 
         // Exile target nonwhite attacking creature. 
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
         this.getSpellAbility().addEffect(new ExileTargetEffect());
         // You gain life equal to its toughness.
         this.getSpellAbility().addEffect(new ExileEffect());

Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java

@@ -60,7 +60,7 @@ public class HelmOfObedience extends CardImpl {
         xCosts.setMinX(1);
         SimpleActivatedAbility abilitiy = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HelmOfObedienceEffect(), xCosts);
         abilitiy.addCost(new TapSourceCost());
-        abilitiy.addTarget(new TargetOpponent(true));
+        abilitiy.addTarget(new TargetOpponent());
         this.addAbility(abilitiy);
     }
 

Mage.Sets/src/mage/sets/alliances/LordOfTresserhorn.java

@@ -76,7 +76,7 @@ public class LordOfTresserhorn extends CardImpl {
         effect.setText(", and target opponent draws two cards");
         effect.setTargetPointer(new SecondTargetPointer());
         ability.addEffect(effect);
-        ability.addTarget(new TargetOpponent(true));
+        ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
         // {B}: Regenerate Lord of Tresserhorn.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")));

Mage.Sets/src/mage/sets/alliances/Phelddagrif.java

@@ -70,17 +70,17 @@ public class Phelddagrif extends CardImpl {
         // {G}: Phelddagrif gains trample until end of turn. Target opponent puts a 1/1 green Hippo creature token onto the battlefield.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl("{G}"));
         ability.addEffect(new CreateTokenTargetEffect(new HippoToken()));
-        ability.addTarget(new TargetOpponent(true));
+        ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
         // {W}: Phelddagrif gains flying until end of turn. Target opponent gains 2 life.
         ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn),new ManaCostsImpl("{W}"));
         ability.addEffect(new GainLifeTargetEffect(2));
-        ability.addTarget(new TargetOpponent(true));
+        ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
         // {U}: Return Phelddagrif to its owner's hand. Target opponent may draw a card.
         ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandSourceEffect(true),new ManaCostsImpl("{U}"));
         ability.addEffect(new DrawCardTargetEffect(1, true));
-        ability.addTarget(new TargetOpponent(true));
+        ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/alliances/SoldierOfFortune.java

@@ -61,7 +61,7 @@ public class SoldierOfFortune extends CardImpl {
 		// {R}, {T}: Target player shuffles his or her library.
 		Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoldierOfFortuneEffect(), new TapSourceCost());
 		ability.addManaCost(new ManaCostsImpl("{R}"));
-		ability.addTarget(new TargetPlayer(true));
+		ability.addTarget(new TargetPlayer());
 		this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/apocalypse/AEtherMutation.java

@@ -52,7 +52,7 @@ public class AEtherMutation extends CardImpl {
 
         // Return target creature to its owner's hand.
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost.
         this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost()));
     }

Mage.Sets/src/mage/sets/apocalypse/AnaDisciple.java

@@ -57,11 +57,11 @@ public class AnaDisciple extends CardImpl {
         this.toughness = new MageInt(1);
         Ability firstAbility  = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U));
         firstAbility.addCost(new TapSourceCost());
-        firstAbility.addTarget(new TargetCreaturePermanent(true));
+        firstAbility.addTarget(new TargetCreaturePermanent());
         this.addAbility(firstAbility);
         Ability secondAbility  = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B));
         secondAbility.addCost(new TapSourceCost());
-        secondAbility.addTarget(new TargetCreaturePermanent(true));
+        secondAbility.addTarget(new TargetCreaturePermanent());
         this.addAbility(secondAbility);
     }
 

Mage.Sets/src/mage/sets/apocalypse/CetaDisciple.java

@@ -55,7 +55,7 @@ public class CetaDisciple extends CardImpl {
         this.toughness = new MageInt(1);
         Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R));
         firstAbility.addCost(new TapSourceCost());
-        firstAbility.addTarget(new TargetCreaturePermanent(true));
+        firstAbility.addTarget(new TargetCreaturePermanent());
         this.addAbility(firstAbility);
         Ability secondAbility = new AnyColorManaAbility(new ColoredManaCost(ColoredManaSymbol.G));
         secondAbility.addCost(new TapSourceCost());

Mage.Sets/src/mage/sets/apocalypse/ConsumeStrength.java

@@ -56,7 +56,7 @@ public class ConsumeStrength extends CardImpl {
 
         // Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn.
         this.getSpellAbility().addEffect(new ConsumeStrengthEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(2, true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(2));
         
     }
 

Mage.Sets/src/mage/sets/apocalypse/Cromat.java

@@ -74,7 +74,7 @@ public class Cromat extends CardImpl {
         filter.add(Predicates.or(new BlockedByIdPredicate(this.getId()),
                                  new BlockingAttackerIdPredicate(this.getId())));        
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{W}{B}"));
-        ability.addTarget(new TargetCreaturePermanent(filter, true));
+        ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
         // {U}{R}: Cromat gains flying until end of turn.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}{R}")));

Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java

@@ -62,7 +62,7 @@ public class DeathMutation extends CardImpl {
 
         // Destroy target nonblack creature. It can't be regenerated.
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter));
         // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost.
         this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost()));
     }

Mage.Sets/src/mage/sets/apocalypse/DegaDisciple.java

@@ -55,11 +55,11 @@ public class DegaDisciple extends CardImpl {
         this.toughness = new MageInt(1);
         Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B));
         firstAbility.addCost(new TapSourceCost());
-        firstAbility.addTarget(new TargetCreaturePermanent(true));
+        firstAbility.addTarget(new TargetCreaturePermanent());
         this.addAbility(firstAbility);
         Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 0, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R));
         secondAbility.addCost(new TapSourceCost());
-        secondAbility.addTarget(new TargetCreaturePermanent(true));
+        secondAbility.addTarget(new TargetCreaturePermanent());
         this.addAbility(secondAbility);
     }
 

Mage.Sets/src/mage/sets/apocalypse/DiversionaryTactics.java

@@ -59,7 +59,7 @@ public class DiversionaryTactics extends CardImpl {
         this.expansionSetCode = "APC";
         this.color.setWhite(true);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapTargetCost(new TargetControlledCreaturePermanent(2, 2, filter, false)));
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 
     }

Mage.Sets/src/mage/sets/apocalypse/FireIce.java

@@ -67,7 +67,7 @@ public class FireIce extends SplitCard {
         // Draw a card.
         getRightHalfCard().getColor().setBlue(true);
         getRightHalfCard().getSpellAbility().addEffect(new TapTargetEffect());
-        getRightHalfCard().getSpellAbility().addTarget(new TargetPermanent(true));
+        getRightHalfCard().getSpellAbility().addTarget(new TargetPermanent());
         getRightHalfCard().getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
 
     }

Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java

@@ -66,7 +66,7 @@ public class IllusionReality extends SplitCard {
         // Reality
         // Destroy target artifact.
         getRightHalfCard().getColor().setGreen(true);
-        getRightHalfCard().getSpellAbility().addTarget(new TargetArtifactPermanent(true));
+        getRightHalfCard().getSpellAbility().addTarget(new TargetArtifactPermanent());
         getRightHalfCard().getSpellAbility().addEffect(new DestroyTargetEffect());
 
     }

Mage.Sets/src/mage/sets/apocalypse/LastCaress.java

@@ -47,7 +47,7 @@ public class LastCaress extends CardImpl {
         this.expansionSetCode = "APC";
         this.color.setBlack(true);
         this.getSpellAbility().addEffect(new LoseLifeTargetEffect(1));
-        this.getSpellAbility().addTarget(new TargetPlayer(true));
+        this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new GainLifeEffect(1));
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
     }

Mage.Sets/src/mage/sets/apocalypse/LegacyWeapon.java

@@ -61,7 +61,7 @@ public class LegacyWeapon extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new ExileTargetEffect(),
                 new ManaCostsImpl("{W}{U}{B}{R}{G}"));
-        ability.addTarget(new TargetPermanent(true));
+        ability.addTarget(new TargetPermanent());
         this.addAbility(ability);
         // If Legacy Weapon would be put into a graveyard from anywhere, reveal Legacy Weapon and shuffle it into its owner's library instead.
         this.addAbility(new PutIntoGraveFromAnywhereTriggeredAbility(new LegacyWeaponEffect()));

Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java

@@ -55,7 +55,7 @@ public class ManaclesOfDecay extends CardImpl {
         this.color.setWhite(true);
         
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/apocalypse/MartyrsTomb.java

@@ -52,7 +52,7 @@ public class MartyrsTomb extends CardImpl {
         this.color.setBlack(true);
         this.color.setWhite(true);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new PayLifeCost(2));
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/apocalypse/NightDay.java

@@ -64,12 +64,12 @@ public class NightDay extends SplitCard {
         // Target creature gets -1/-1 until end of turn.
         getLeftHalfCard().getColor().setBlack(true);
         getLeftHalfCard().getSpellAbility().addEffect(new BoostTargetEffect(-1,-1,Duration.EndOfTurn));
-        getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
 
         // Day
         // Creatures target player controls get +1/+1 until end of turn.
         getRightHalfCard().getColor().setWhite(true);
-        getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer(true));
+        getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer());
         getRightHalfCard().getSpellAbility().addEffect(new DayEffect());
 
     }

Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java

@@ -74,7 +74,7 @@ public class OrimsThunder extends CardImpl {
 
         // Destroy target artifact or enchantment. If Orim's Thunder was kicked, it deals damage equal to that permanent's converted mana cost to target creature.
         this.getSpellAbility().addEffect(new OrimsThunderEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter));
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
                 new OrimsThunderEffect2(),
                 KickedCondition.getInstance(),
@@ -86,7 +86,7 @@ public class OrimsThunder extends CardImpl {
     public void adjustTargets(Ability ability, Game game) {
         if (ability instanceof SpellAbility) {
             if (KickedCondition.getInstance().apply(game, ability)) {
-                ability.addTarget(new TargetCreaturePermanent(true));
+                ability.addTarget(new TargetCreaturePermanent());
             }
         }
     }

Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java

@@ -72,8 +72,8 @@ public class QuagmireDruid extends CardImpl {
         // {G}, {T}, Sacrifice a creature: Destroy target enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(false), new ColoredManaCost(ColoredManaSymbol.G));
         ability.addCost(new TapSourceCost());
-        ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)));
+        ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent()));
-        ability.addTarget(new TargetPermanent(filter, true));
+        ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/apocalypse/QuicksilverDagger.java

@@ -62,7 +62,7 @@ public class QuicksilverDagger extends CardImpl {
         this.color.setBlue(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
@@ -70,7 +70,7 @@ public class QuicksilverDagger extends CardImpl {
         
         // Enchanted creature has "{tap}: This creature deals 1 damage to target player. You draw a card."
         Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost());
-        gainAbility.addTarget(new TargetPlayer(true));
+        gainAbility.addTarget(new TargetPlayer());
         gainAbility.addEffect(new DrawCardSourceControllerEffect(1));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainAbility, AttachmentType.AURA)));
     }

Mage.Sets/src/mage/sets/apocalypse/RakaDisciple.java

@@ -61,7 +61,7 @@ public class RakaDisciple extends CardImpl {
         this.addAbility(firstAbility);
         Ability secondAbility  = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.U));
         secondAbility.addCost(new TapSourceCost());
-        secondAbility.addTarget(new TargetCreaturePermanent(true));
+        secondAbility.addTarget(new TargetCreaturePermanent());
         this.addAbility(secondAbility);
     }
 

Mage.Sets/src/mage/sets/apocalypse/SavageGorilla.java

@@ -61,7 +61,7 @@ public class SavageGorilla extends CardImpl {
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addEffect(new DrawCardSourceControllerEffect(1));
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/apocalypse/TemporalSpring.java

@@ -46,7 +46,7 @@ public class TemporalSpring extends CardImpl {
         this.color.setBlue(true);
         this.color.setGreen(true);
         this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetPermanent(true));
+        this.getSpellAbility().addTarget(new TargetPermanent());
     }
 
     public TemporalSpring(final TemporalSpring card) {

Mage.Sets/src/mage/sets/apocalypse/Vindicate.java

@@ -47,7 +47,7 @@ public class Vindicate extends CardImpl {
         this.color.setWhite(true);
         this.color.setBlack(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(true));
+        this.getSpellAbility().addTarget(new TargetPermanent());
     }
 
     public Vindicate (final Vindicate card) {

Mage.Sets/src/mage/sets/arabiannights/KingSuleiman.java

@@ -67,7 +67,7 @@ public class KingSuleiman extends CardImpl {
 
         // {tap}: Destroy target Djinn or Efreet.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter, true));
+        ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java

@@ -82,7 +82,7 @@ public class OldManOfTheSea extends CardImpl {
                 "Gain control of target creature with power less than or equal to {this}'s power for as long as {this} remains tapped and that creature's power remains less than or equal to {this}'s power");
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new GenericManaCost(2));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(controllableCreatures, true));
+        ability.addTarget(new TargetCreaturePermanent(controllableCreatures));
         this.addAbility(ability);
         // internal ability to check condition
         this.addAbility(new OldManOfTheSeaStateBasedTriggeredAbility());

Mage.Sets/src/mage/sets/avacynrestored/Aggravate.java

@@ -59,7 +59,7 @@ public class Aggravate extends CardImpl {
 
         // Aggravate deals 1 damage to each creature target player controls.
         this.getSpellAbility().addEffect(new AggraveteEffect());
-        this.getSpellAbility().addTarget(new TargetPlayer(true));
+        this.getSpellAbility().addTarget(new TargetPlayer());
         // Each creature dealt damage this way attacks this turn if able.
         this.getSpellAbility().addEffect(new AggravateRequirementEffect());
         this.addWatcher(new DamagedByWatcher());

Mage.Sets/src/mage/sets/avacynrestored/AppetiteForBrains.java

@@ -56,7 +56,7 @@ public class AppetiteForBrains extends CardImpl {
 
         // Target opponent reveals his or her hand. You choose a card from it with converted mana cost 4 or greater and exile that card.
         this.getSpellAbility().addEffect(new ExileCardYouChooseTargetOpponentEffect(filter));
-        this.getSpellAbility().addTarget(new TargetOpponent(true));
+        this.getSpellAbility().addTarget(new TargetOpponent());
     }
 
     public AppetiteForBrains(final AppetiteForBrains card) {

Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java

@@ -63,7 +63,7 @@ public class BanishingStroke extends CardImpl {
 
         // Put target artifact, creature, or enchantment on the bottom of its owner's library.
         this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(false));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter));
 
         // Miracle {W}
         this.addAbility(new MiracleAbility(new ManaCostsImpl("{W}")));

Mage.Sets/src/mage/sets/avacynrestored/BloodArtist.java

@@ -58,7 +58,7 @@ public class BloodArtist extends CardImpl {
         // Whenever Blood Artist or another creature dies, target player loses 1 life and you gain 1 life.
         Ability ability = new DiesThisOrAnotherCreatureTriggeredAbility(new LoseLifeTargetEffect(1), false);
         ability.addEffect(new GainLifeEffect(1));
-        Target target = new TargetPlayer(true);
+        Target target = new TargetPlayer();
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);

Mage.Sets/src/mage/sets/avacynrestored/BloodflowConnoisseur.java

@@ -59,7 +59,7 @@ public class BloodflowConnoisseur extends CardImpl {
 
         // Sacrifice a creature: Put a +1/+1 counter on Bloodflow Connoisseur.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new ManaCostsImpl());
-        ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)));
+        ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent()));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/avacynrestored/BonfireOfTheDamned.java

@@ -58,7 +58,7 @@ public class BonfireOfTheDamned extends CardImpl {
 
         // Bonfire of the Damned deals X damage to target player and each creature he or she controls.
         this.getSpellAbility().addEffect(new BonfireOfTheDamnedEffect());
-        this.getSpellAbility().addTarget(new TargetPlayer(true));
+        this.getSpellAbility().addTarget(new TargetPlayer());
 
         // Miracle {X}{R}
         this.addAbility(new MiracleAbility(new ManaCostsImpl("{X}{R}")));

Mage.Sets/src/mage/sets/avacynrestored/BurnAtTheStake.java

@@ -66,7 +66,7 @@ public class BurnAtTheStake extends CardImpl {
         this.getSpellAbility().addCost(new TapVariableTargetCost(filter, true, "any number of"));
         // Burn at the Stake deals damage to target creature or player equal to three times the number of creatures tapped this way.
         this.getSpellAbility().addEffect(new BurnAtTheStakeEffect());
-        this.getSpellAbility().addTarget(new TargetCreatureOrPlayer(true));
+        this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
     }
 
     public BurnAtTheStake(final BurnAtTheStake card) {

Mage.Sets/src/mage/sets/avacynrestored/CallToServe.java

@@ -65,7 +65,7 @@ public class CallToServe extends CardImpl {
         this.color.setWhite(true);
 
         // Enchant nonblack creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/avacynrestored/CaptainOfTheMists.java

@@ -76,7 +76,7 @@ public class CaptainOfTheMists extends CardImpl {
         // {1}{U}, {tap}: You may tap or untap target permanent.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{1}{U}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(true));
+        ability.addTarget(new TargetPermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/avacynrestored/Cloudshift.java

@@ -49,7 +49,7 @@ public class Cloudshift extends CardImpl {
         this.color.setWhite(true);
 
         // Exile target creature you control, then return that card to the battlefield under your control.
-        this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
         this.getSpellAbility().addEffect(new ExileTargetForSourceEffect("Cloudshift"));
         this.getSpellAbility().addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect());
     }

Mage.Sets/src/mage/sets/avacynrestored/CommandersAuthority.java

@@ -55,7 +55,7 @@ public class CommandersAuthority extends CardImpl {
         this.color.setWhite(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/avacynrestored/ConjurersCloset.java

@@ -50,7 +50,7 @@ public class ConjurersCloset extends CardImpl {
         // At the beginning of your end step, you may exile target creature you control, then return that card to the battlefield under your control.
         Ability ability = new BeginningOfYourEndStepTriggeredAbility(new ExileTargetForSourceEffect("Conjurer's Closet Exile"), true);
         ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect());
-        ability.addTarget(new TargetControlledCreaturePermanent(true));
+        ability.addTarget(new TargetControlledCreaturePermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/avacynrestored/CorpseTraders.java

@@ -59,8 +59,8 @@ public class CorpseTraders extends CardImpl {
 
         // {2}{B}, Sacrifice a creature: Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardCardYouChooseTargetEffect(), new ManaCostsImpl("{2}{B}"));
-        ability.addTarget(new TargetOpponent(true));
+        ability.addTarget(new TargetOpponent());
-        ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)));
+        ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent()));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/avacynrestored/CripplingChill.java

@@ -50,7 +50,7 @@ public class CripplingChill extends CardImpl {
         this.color.setBlue(true);
 
         // Tap target creature. It doesn't untap during its controller's next untap step.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new TapTargetEffect());
         this.getSpellAbility().addEffect(new SkipNextUntapTargetEffect());
         // Draw a card.

Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java

@@ -56,7 +56,7 @@ public class Cursebreak extends CardImpl {
         this.color.setWhite(true);
 
         // Destroy target enchantment. You gain 2 life.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new GainLifeEffect(2));
     }

Mage.Sets/src/mage/sets/avacynrestored/DarkImpostor.java

@@ -68,7 +68,7 @@ public class DarkImpostor extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ImprintTargetEffect(), new ManaCostsImpl("{4}{B}{B}"));
         ability.addEffect(new ExileTargetEffect(null, "Dark Impostor"));
         ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()));
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 
         // Dark Impostor has all activated abilities of all creature cards exiled with it.

Mage.Sets/src/mage/sets/avacynrestored/DeathWind.java

@@ -53,7 +53,7 @@ public class DeathWind extends CardImpl {
         // Target creature gets -X/-X until end of turn.
         DynamicValue x = new SignInversionDynamicValue(new ManacostVariableValue());
         this.getSpellAbility().addEffect(new BoostTargetEffect(x, x, Duration.EndOfTurn, true));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
 
     public DeathWind(final DeathWind card) {

Mage.Sets/src/mage/sets/avacynrestored/Defang.java

@@ -55,7 +55,7 @@ public class Defang extends CardImpl {
         this.color.setWhite(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java

@@ -81,7 +81,7 @@ public class DevoutChaplain extends CardImpl {
         // {tap}, Tap two untapped Humans you control: Exile target artifact or enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost());
         ability.addCost(new TapTargetCost(new TargetControlledPermanent(2, 2, humanFilter, false)));
-        ability.addTarget(new TargetPermanent(filter, true));
+        ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/avacynrestored/Dreadwaters.java

@@ -59,7 +59,7 @@ public class Dreadwaters extends CardImpl {
         this.color.setBlue(true);
 
         // Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of lands you control.
-        this.getSpellAbility().addTarget(new TargetPlayer(true));
+        this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter)));
     }
 

Mage.Sets/src/mage/sets/avacynrestored/DualCasting.java

@@ -68,7 +68,7 @@ public class DualCasting extends CardImpl {
         this.color.setRed(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java

@@ -62,7 +62,7 @@ public class EatenBySpiders extends CardImpl {
 
         // Destroy target creature with flying and all Equipment attached to that creature.
         this.getSpellAbility().addEffect(new EatenBySpidersEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
     }
 
     public EatenBySpiders(final EatenBySpiders card) {

Mage.Sets/src/mage/sets/avacynrestored/EssenceHarvest.java

@@ -55,7 +55,7 @@ public class EssenceHarvest extends CardImpl {
 
         // Target player loses X life and you gain X life, where X is the greatest power among creatures you control.
         this.getSpellAbility().addEffect(new EssenceHarvestEffect());
-        this.getSpellAbility().addTarget(new TargetPlayer(true));
+        this.getSpellAbility().addTarget(new TargetPlayer());
     }
 
     public EssenceHarvest(final EssenceHarvest card) {

Mage.Sets/src/mage/sets/avacynrestored/FalkenrathExterminator.java

@@ -64,7 +64,7 @@ public class FalkenrathExterminator extends CardImpl {
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false));
         // {2}{R}: Falkenrath Exterminator deals damage to target creature equal to the number of +1/+1 counters on Falkenrath Exterminator.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new CountersCount(CounterType.P1P1)), new ManaCostsImpl("{2}{R}"));
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/avacynrestored/FerventCathar.java

@@ -59,7 +59,7 @@ public class FerventCathar extends CardImpl {
 
         // When Fervent Cathar enters the battlefield, target creature can't block this turn.
         Ability ability = new EntersBattlefieldTriggeredAbility(new CantBlockTargetEffect(Duration.EndOfTurn));
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/avacynrestored/GallowsAtWillowHill.java

@@ -72,7 +72,7 @@ public class GallowsAtWillowHill extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GallowsAtWillowHillEffect(), new GenericManaCost(3));
         ability.addCost(new TapSourceCost());
         ability.addCost(new TapTargetCost(new TargetControlledPermanent(3, 3, humanFilter, false)));
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
 

Mage.Sets/src/mage/sets/avacynrestored/GhostlyTouch.java

@@ -56,7 +56,7 @@ public class GhostlyTouch extends CardImpl {
         this.color.setBlue(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
@@ -64,7 +64,7 @@ public class GhostlyTouch extends CardImpl {
 
         // Enchanted creature has "Whenever this creature attacks, you may tap or untap target permanent."
         Ability gainedAbility = new AttacksTriggeredAbility(new MayTapOrUntapTargetEffect(), true);
-        gainedAbility.addTarget(new TargetPermanent(true));
+        gainedAbility.addTarget(new TargetPermanent());
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA)));
     }
 

Mage.Sets/src/mage/sets/avacynrestored/Ghoulflesh.java

@@ -54,7 +54,7 @@ public class Ghoulflesh extends CardImpl {
         this.color.setBlack(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature));
         this.addAbility(new EnchantAbility(auraTarget.getTargetName()));

Mage.Sets/src/mage/sets/avacynrestored/GraveExchange.java

@@ -64,7 +64,7 @@ public class GraveExchange extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
         // Target player sacrifices a creature.
         this.getSpellAbility().addEffect(new GraveExchangeEffect());
-        this.getSpellAbility().addTarget(new TargetPlayer(true));
+        this.getSpellAbility().addTarget(new TargetPlayer());
     }
 
     public GraveExchange(final GraveExchange card) {

Mage.Sets/src/mage/sets/avacynrestored/Grounded.java

@@ -53,7 +53,7 @@ public class Grounded extends CardImpl {
         this.color.setGreen(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/avacynrestored/GuiseOfFire.java

@@ -54,7 +54,7 @@ public class GuiseOfFire extends CardImpl {
         this.color.setRed(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(true);
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());

Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java

@@ -93,7 +93,7 @@ class HavengulSkaabAbility extends TriggeredAbilityImpl {
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) {
-            TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(1, 1, filter, false, true);
+            TargetControlledCreaturePermanent target = new TargetControlledCreaturePermanent(1, 1, filter, false);
             this.addTarget(target);
             return true;
         }

Mage.Sets/src/mage/sets/avacynrestored/HolyJusticiar.java

@@ -62,7 +62,7 @@ public class HolyJusticiar extends CardImpl {
         // {2}{W}, {tap}: Tap target creature. If that creature is a Zombie, exile it.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HolyJusticiarEffect(), new ManaCostsImpl("{2}{W}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(true));
+        ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 
     }

Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java

@@ -55,7 +55,7 @@ public class HumanFrailty extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target Human creature.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }