diff --git a/Mage.Sets/src/mage/cards/a/Abduction.java b/Mage.Sets/src/mage/cards/a/Abduction.java index 31898d900c3..82e2e643d10 100644 --- a/Mage.Sets/src/mage/cards/a/Abduction.java +++ b/Mage.Sets/src/mage/cards/a/Abduction.java @@ -34,7 +34,7 @@ public final class Abduction extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Abduction enters the battlefield, untap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/a/AboshansDesire.java b/Mage.Sets/src/mage/cards/a/AboshansDesire.java index 454c86dfc83..fb700f46b44 100644 --- a/Mage.Sets/src/mage/cards/a/AboshansDesire.java +++ b/Mage.Sets/src/mage/cards/a/AboshansDesire.java @@ -32,7 +32,7 @@ public final class AboshansDesire extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java index e10b142855f..fb5b81258e8 100644 --- a/Mage.Sets/src/mage/cards/a/AbundantGrowth.java +++ b/Mage.Sets/src/mage/cards/a/AbundantGrowth.java @@ -31,7 +31,7 @@ public final class AbundantGrowth extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Abundant Growth enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java index 9f25386ccca..e9eba6d42a8 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanRunemark.java +++ b/Mage.Sets/src/mage/cards/a/AbzanRunemark.java @@ -41,7 +41,7 @@ public final class AbzanRunemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/a/AerialModification.java b/Mage.Sets/src/mage/cards/a/AerialModification.java index 83aacbb8bf2..a9648df897a 100644 --- a/Mage.Sets/src/mage/cards/a/AerialModification.java +++ b/Mage.Sets/src/mage/cards/a/AerialModification.java @@ -40,7 +40,7 @@ public final class AerialModification extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted permanent is a Vehicle, it's a creature in addition to its other types. diff --git a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java index 5fe1e7abe7b..5dd8864cad7 100644 --- a/Mage.Sets/src/mage/cards/a/AetherMeltdown.java +++ b/Mage.Sets/src/mage/cards/a/AetherMeltdown.java @@ -40,7 +40,7 @@ public final class AetherMeltdown extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Aether Meltdown enters the battlefield, you get {E}{E}. diff --git a/Mage.Sets/src/mage/cards/a/AetherTunnel.java b/Mage.Sets/src/mage/cards/a/AetherTunnel.java index 980e16790a0..6ba80c20616 100644 --- a/Mage.Sets/src/mage/cards/a/AetherTunnel.java +++ b/Mage.Sets/src/mage/cards/a/AetherTunnel.java @@ -33,7 +33,7 @@ public final class AetherTunnel extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0 and can't be blocked. diff --git a/Mage.Sets/src/mage/cards/a/AetherWeb.java b/Mage.Sets/src/mage/cards/a/AetherWeb.java index e635c846f5f..42d0474445e 100644 --- a/Mage.Sets/src/mage/cards/a/AetherWeb.java +++ b/Mage.Sets/src/mage/cards/a/AetherWeb.java @@ -36,7 +36,7 @@ public final class AetherWeb extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1, has reach, and can block creatures with shadow as though they didn't have shadow. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 1)); diff --git a/Mage.Sets/src/mage/cards/a/Aggression.java b/Mage.Sets/src/mage/cards/a/Aggression.java index 7490ecea13d..ff49c5be3b5 100644 --- a/Mage.Sets/src/mage/cards/a/Aggression.java +++ b/Mage.Sets/src/mage/cards/a/Aggression.java @@ -46,7 +46,7 @@ public final class Aggression extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has first strike and trample. diff --git a/Mage.Sets/src/mage/cards/a/Agility.java b/Mage.Sets/src/mage/cards/a/Agility.java index b46f495a3fc..27b094df38d 100644 --- a/Mage.Sets/src/mage/cards/a/Agility.java +++ b/Mage.Sets/src/mage/cards/a/Agility.java @@ -30,7 +30,7 @@ public final class Agility extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has flanking. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1))); diff --git a/Mage.Sets/src/mage/cards/a/Agoraphobia.java b/Mage.Sets/src/mage/cards/a/Agoraphobia.java index 50723fd5321..9af799cb4a0 100644 --- a/Mage.Sets/src/mage/cards/a/Agoraphobia.java +++ b/Mage.Sets/src/mage/cards/a/Agoraphobia.java @@ -34,7 +34,7 @@ public final class Agoraphobia extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -5/-0. diff --git a/Mage.Sets/src/mage/cards/a/AirBladder.java b/Mage.Sets/src/mage/cards/a/AirBladder.java index 775c4230320..77131379fd7 100644 --- a/Mage.Sets/src/mage/cards/a/AirBladder.java +++ b/Mage.Sets/src/mage/cards/a/AirBladder.java @@ -31,7 +31,7 @@ public final class AirBladder extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. diff --git a/Mage.Sets/src/mage/cards/a/AkkiWarPaint.java b/Mage.Sets/src/mage/cards/a/AkkiWarPaint.java index 38ad19c6a00..151ea9e17ce 100644 --- a/Mage.Sets/src/mage/cards/a/AkkiWarPaint.java +++ b/Mage.Sets/src/mage/cards/a/AkkiWarPaint.java @@ -34,7 +34,7 @@ public final class AkkiWarPaint extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted permanent is a creature, it gets +2/+1. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/a/AlexisCloak.java b/Mage.Sets/src/mage/cards/a/AlexisCloak.java index dbbee01dceb..358fe9d2e3d 100644 --- a/Mage.Sets/src/mage/cards/a/AlexisCloak.java +++ b/Mage.Sets/src/mage/cards/a/AlexisCloak.java @@ -31,7 +31,7 @@ public final class AlexisCloak extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shroud. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/a/AllThatGlitters.java b/Mage.Sets/src/mage/cards/a/AllThatGlitters.java index 5ab3bc2e889..4ea7ef29ab0 100644 --- a/Mage.Sets/src/mage/cards/a/AllThatGlitters.java +++ b/Mage.Sets/src/mage/cards/a/AllThatGlitters.java @@ -39,7 +39,7 @@ public final class AllThatGlitters extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 for each artifact and/or enchantment you control. diff --git a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java index eb70f91bef9..420b900b0ae 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaAuthority.java +++ b/Mage.Sets/src/mage/cards/a/AlphaAuthority.java @@ -33,7 +33,7 @@ public final class AlphaAuthority extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has hexproof and can't be blocked by more than one creature. diff --git a/Mage.Sets/src/mage/cards/a/AlphaStatus.java b/Mage.Sets/src/mage/cards/a/AlphaStatus.java index 1fd2394ef74..d3c56679191 100644 --- a/Mage.Sets/src/mage/cards/a/AlphaStatus.java +++ b/Mage.Sets/src/mage/cards/a/AlphaStatus.java @@ -32,7 +32,7 @@ public final class AlphaStatus extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 for each other creature on the battlefield that shares a creature type with it. diff --git a/Mage.Sets/src/mage/cards/a/AncestorsEmbrace.java b/Mage.Sets/src/mage/cards/a/AncestorsEmbrace.java index 69ae1e5e60f..8929484e38f 100644 --- a/Mage.Sets/src/mage/cards/a/AncestorsEmbrace.java +++ b/Mage.Sets/src/mage/cards/a/AncestorsEmbrace.java @@ -32,7 +32,7 @@ public final class AncestorsEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has lifelink. diff --git a/Mage.Sets/src/mage/cards/a/AncestralMask.java b/Mage.Sets/src/mage/cards/a/AncestralMask.java index bbeea358e10..843c1b50ee9 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralMask.java +++ b/Mage.Sets/src/mage/cards/a/AncestralMask.java @@ -35,7 +35,7 @@ public final class AncestralMask extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 for each other enchantment on the battlefield. PermanentsOnBattlefieldCount countEnchantments = new PermanentsOnBattlefieldCount(new FilterEnchantmentPermanent(filter), 2); diff --git a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java index 0c75c48aea7..ae6f7f9414a 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralVengeance.java +++ b/Mage.Sets/src/mage/cards/a/AncestralVengeance.java @@ -31,7 +31,7 @@ public final class AncestralVengeance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Ancestral Vengeance enters the battlefield, put a +1/+1 counter on target creature you control. diff --git a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java index b88ac3acfe5..6a2948d30e1 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicDestiny.java +++ b/Mage.Sets/src/mage/cards/a/AngelicDestiny.java @@ -34,7 +34,7 @@ public final class AngelicDestiny extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +4/+4, has flying and first strike, and is an Angel in addition to its other types. diff --git a/Mage.Sets/src/mage/cards/a/AngelicGift.java b/Mage.Sets/src/mage/cards/a/AngelicGift.java index 8f643dee812..1eed31cce37 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicGift.java +++ b/Mage.Sets/src/mage/cards/a/AngelicGift.java @@ -30,7 +30,7 @@ public final class AngelicGift extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Angelic Gift enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/a/AngelicReward.java b/Mage.Sets/src/mage/cards/a/AngelicReward.java index 22759fb9d28..fa24705bea9 100644 --- a/Mage.Sets/src/mage/cards/a/AngelicReward.java +++ b/Mage.Sets/src/mage/cards/a/AngelicReward.java @@ -29,7 +29,7 @@ public final class AngelicReward extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and has flying. diff --git a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java index 21ce4b4f6c3..6ffab126b3b 100644 --- a/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java +++ b/Mage.Sets/src/mage/cards/a/AnimalBoneyard.java @@ -37,7 +37,7 @@ public final class AnimalBoneyard extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}, Sacrifice a creature: You gain life equal to that creature's toughness." Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnimalBoneyardEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java index d4dd493587f..bdd56f327e0 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateArtifact.java +++ b/Mage.Sets/src/mage/cards/a/AnimateArtifact.java @@ -38,7 +38,7 @@ public final class AnimateArtifact extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted artifact isn't a creature, it's an artifact creature with power and toughness each equal to its converted mana cost. diff --git a/Mage.Sets/src/mage/cards/a/AnimateDead.java b/Mage.Sets/src/mage/cards/a/AnimateDead.java index 421a431c983..ac55686a305 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateDead.java +++ b/Mage.Sets/src/mage/cards/a/AnimateDead.java @@ -29,7 +29,7 @@ public final class AnimateDead extends CardImpl { TargetCardInGraveyard auraTarget = new TargetCardInGraveyard(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Animate Dead enters the battlefield, if it's on the battlefield, it loses "enchant creature // card in a graveyard" and gains "enchant creature put onto the battlefield with Animate Dead." diff --git a/Mage.Sets/src/mage/cards/a/AnimateWall.java b/Mage.Sets/src/mage/cards/a/AnimateWall.java index b8134497a4e..398d8b26129 100644 --- a/Mage.Sets/src/mage/cards/a/AnimateWall.java +++ b/Mage.Sets/src/mage/cards/a/AnimateWall.java @@ -37,7 +37,7 @@ public final class AnimateWall extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted Wall can attack as though it didn't have defender. diff --git a/Mage.Sets/src/mage/cards/a/Annex.java b/Mage.Sets/src/mage/cards/a/Annex.java index 411c8e3704d..8518e84fec3 100644 --- a/Mage.Sets/src/mage/cards/a/Annex.java +++ b/Mage.Sets/src/mage/cards/a/Annex.java @@ -29,7 +29,7 @@ public final class Annex extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted land. diff --git a/Mage.Sets/src/mage/cards/a/AntiMagicAura.java b/Mage.Sets/src/mage/cards/a/AntiMagicAura.java index 02dfaf16547..979289ed2f7 100644 --- a/Mage.Sets/src/mage/cards/a/AntiMagicAura.java +++ b/Mage.Sets/src/mage/cards/a/AntiMagicAura.java @@ -33,7 +33,7 @@ public final class AntiMagicAura extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be the target of spells and can't be enchanted by other Auras. diff --git a/Mage.Sets/src/mage/cards/a/Apathy.java b/Mage.Sets/src/mage/cards/a/Apathy.java index 639903889b0..318589b422d 100644 --- a/Mage.Sets/src/mage/cards/a/Apathy.java +++ b/Mage.Sets/src/mage/cards/a/Apathy.java @@ -35,7 +35,7 @@ public final class Apathy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. @@ -90,4 +90,4 @@ class ApathyEffect extends OneShotEffect { permanent = game.getPermanent(permanent.getAttachedTo()); return permanent != null && permanent.untap(game); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AqueousForm.java b/Mage.Sets/src/mage/cards/a/AqueousForm.java index 24ba9e9c984..2feb1fa12f1 100644 --- a/Mage.Sets/src/mage/cards/a/AqueousForm.java +++ b/Mage.Sets/src/mage/cards/a/AqueousForm.java @@ -30,7 +30,7 @@ public final class AqueousForm extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedAttachedEffect(AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/a/Arachnoform.java b/Mage.Sets/src/mage/cards/a/Arachnoform.java index 15f706fba4a..cc01b911a31 100644 --- a/Mage.Sets/src/mage/cards/a/Arachnoform.java +++ b/Mage.Sets/src/mage/cards/a/Arachnoform.java @@ -33,7 +33,7 @@ public final class Arachnoform extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has reach, and is every creature type. diff --git a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java index 462eb823ad2..da10563e4a3 100644 --- a/Mage.Sets/src/mage/cards/a/ArachnusWeb.java +++ b/Mage.Sets/src/mage/cards/a/ArachnusWeb.java @@ -32,7 +32,7 @@ public final class ArachnusWeb extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/a/ArcaneFlight.java b/Mage.Sets/src/mage/cards/a/ArcaneFlight.java index 255fd23221d..df6222d567d 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneFlight.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneFlight.java @@ -32,7 +32,7 @@ public final class ArcaneFlight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying diff --git a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java index 0a6e0a6deea..80eb1c22ecb 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneTeachings.java @@ -31,7 +31,7 @@ public final class ArcaneTeachings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/ArcanumWings.java b/Mage.Sets/src/mage/cards/a/ArcanumWings.java index 2711853d8b9..7aa520175c8 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanumWings.java +++ b/Mage.Sets/src/mage/cards/a/ArcanumWings.java @@ -30,7 +30,7 @@ public final class ArcanumWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. diff --git a/Mage.Sets/src/mage/cards/a/ArcheryTraining.java b/Mage.Sets/src/mage/cards/a/ArcheryTraining.java index 5124b39bf70..6016a5173f9 100644 --- a/Mage.Sets/src/mage/cards/a/ArcheryTraining.java +++ b/Mage.Sets/src/mage/cards/a/ArcheryTraining.java @@ -38,7 +38,7 @@ public final class ArcheryTraining extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, you may put an arrow counter on Archery Training. diff --git a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java index 90fdb9290ac..74ba32112c3 100644 --- a/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java +++ b/Mage.Sets/src/mage/cards/a/ArmadilloCloak.java @@ -33,7 +33,7 @@ public final class ArmadilloCloak extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has trample. diff --git a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java index 19eea8e6f6b..10662727c23 100644 --- a/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java +++ b/Mage.Sets/src/mage/cards/a/ArmamentOfNyx.java @@ -43,7 +43,7 @@ public final class ArmamentOfNyx extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); Condition condition = new AttachedToMatchesFilterCondition(filter); // Enchanted creature has double strike as long as it's an enchantment. Otherwise, prevent all damage that would be dealt by enchanted creature diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java index b57ede73a53..f82b60729ce 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfFaith.java @@ -29,7 +29,7 @@ public final class ArmorOfFaith extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java index 905942295f1..69b30553c8e 100644 --- a/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java +++ b/Mage.Sets/src/mage/cards/a/ArmorOfThorns.java @@ -32,7 +32,7 @@ public final class ArmorOfThorns extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java index dbef7ce772a..47ae381a2b8 100644 --- a/Mage.Sets/src/mage/cards/a/ArmoredAscension.java +++ b/Mage.Sets/src/mage/cards/a/ArmoredAscension.java @@ -43,7 +43,7 @@ public final class ArmoredAscension extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1 for each Plains you control and has flying. SimpleStaticAbility ability = new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/a/Arrest.java b/Mage.Sets/src/mage/cards/a/Arrest.java index 720562b2901..bfd0899f844 100644 --- a/Mage.Sets/src/mage/cards/a/Arrest.java +++ b/Mage.Sets/src/mage/cards/a/Arrest.java @@ -32,7 +32,7 @@ public final class Arrest extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); //Enchanted creature can't attack or block, and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/a/ArtifactPossession.java b/Mage.Sets/src/mage/cards/a/ArtifactPossession.java index db65900b08a..cc4ca7ef0d7 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactPossession.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactPossession.java @@ -33,7 +33,7 @@ public final class ArtifactPossession extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted artifact becomes tapped or a player activates an ability of enchanted artifact without {tap} in its activation cost, Artifact Possession deals 2 damage to that artifact's controller. this.addAbility(new AbilityActivatedTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/a/ArtifactWard.java b/Mage.Sets/src/mage/cards/a/ArtifactWard.java index 2015ef924f6..f072a17c41b 100644 --- a/Mage.Sets/src/mage/cards/a/ArtifactWard.java +++ b/Mage.Sets/src/mage/cards/a/ArtifactWard.java @@ -28,7 +28,7 @@ public final class ArtifactWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't be blocked by artifact creatures. // Prevent all damage that would be dealt to enchanted creature by artifact sources. diff --git a/Mage.Sets/src/mage/cards/a/ArtificersHex.java b/Mage.Sets/src/mage/cards/a/ArtificersHex.java index 79550c79b20..d3c04f964e4 100644 --- a/Mage.Sets/src/mage/cards/a/ArtificersHex.java +++ b/Mage.Sets/src/mage/cards/a/ArtificersHex.java @@ -36,7 +36,7 @@ public final class ArtificersHex extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, if enchanted Equipment is attached to a creature, destroy that creature. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ArtificersHexEffect(), TargetController.YOU, false, true)); diff --git a/Mage.Sets/src/mage/cards/a/AshasFavor.java b/Mage.Sets/src/mage/cards/a/AshasFavor.java index 29895a32691..2d126140d9c 100644 --- a/Mage.Sets/src/mage/cards/a/AshasFavor.java +++ b/Mage.Sets/src/mage/cards/a/AshasFavor.java @@ -31,7 +31,7 @@ public final class AshasFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect( FlyingAbility.getInstance(), AttachmentType.AURA diff --git a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java index 4c3b9da9708..b1aabc72608 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfGorgon.java @@ -31,7 +31,7 @@ public final class AspectOfGorgon extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+3 and has deathtouch. diff --git a/Mage.Sets/src/mage/cards/a/AspectOfLamprey.java b/Mage.Sets/src/mage/cards/a/AspectOfLamprey.java index 5ad5b843a02..5f38ded1250 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfLamprey.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfLamprey.java @@ -34,7 +34,7 @@ public final class AspectOfLamprey extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Aspect of Lamprey enters the battlefield, target opponent discards two cards. diff --git a/Mage.Sets/src/mage/cards/a/AspectOfManticore.java b/Mage.Sets/src/mage/cards/a/AspectOfManticore.java index 81f6abbd4d2..aa7398718ac 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfManticore.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfManticore.java @@ -34,7 +34,7 @@ public final class AspectOfManticore extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Aspect of Manticore enters the battlefield, enchanted creature gains first strike until end of turn. diff --git a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java index f9f96e96d00..5c4938a4fa4 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfMongoose.java @@ -31,7 +31,7 @@ public final class AspectOfMongoose extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shroud. diff --git a/Mage.Sets/src/mage/cards/a/AspectOfWolf.java b/Mage.Sets/src/mage/cards/a/AspectOfWolf.java index 3c1326272b9..29340772feb 100644 --- a/Mage.Sets/src/mage/cards/a/AspectOfWolf.java +++ b/Mage.Sets/src/mage/cards/a/AspectOfWolf.java @@ -34,7 +34,7 @@ public final class AspectOfWolf extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +X/+Y, where X is half the number of Forests you control, rounded down, and Y is half the number of Forests you control, rounded up. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java index 1da2a8c12bf..a8a164ba156 100644 --- a/Mage.Sets/src/mage/cards/a/AuraOfDominion.java +++ b/Mage.Sets/src/mage/cards/a/AuraOfDominion.java @@ -41,7 +41,7 @@ public final class AuraOfDominion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapEnchantedEffect(), new GenericManaCost(1)); ability.addCost(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))); this.addAbility(ability); @@ -56,4 +56,4 @@ public final class AuraOfDominion extends CardImpl { return new AuraOfDominion(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java index e78f73ea225..346431062b1 100644 --- a/Mage.Sets/src/mage/cards/a/AuramancersGuise.java +++ b/Mage.Sets/src/mage/cards/a/AuramancersGuise.java @@ -36,7 +36,7 @@ public final class AuramancersGuise extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 for each Aura attached to it and has vigilance. diff --git a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java index 1cab37a56ac..8d4e99a5fe7 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java +++ b/Mage.Sets/src/mage/cards/a/AwakenTheAncient.java @@ -34,7 +34,7 @@ public final class AwakenTheAncient extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted Mountain is a 7/7 red Giant creature with haste. It's still a land. diff --git a/Mage.Sets/src/mage/cards/a/AwakenedAwareness.java b/Mage.Sets/src/mage/cards/a/AwakenedAwareness.java index 3c52486f611..b79d05c0ee8 100644 --- a/Mage.Sets/src/mage/cards/a/AwakenedAwareness.java +++ b/Mage.Sets/src/mage/cards/a/AwakenedAwareness.java @@ -34,7 +34,7 @@ public final class AwakenedAwareness extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Awakened Awareness enters the battlefield, put X +1/+1 counters on enchanted permanent. this.addAbility(new EntersBattlefieldTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/a/AwesomePresence.java b/Mage.Sets/src/mage/cards/a/AwesomePresence.java index 4735a512544..1401ce5e4e7 100644 --- a/Mage.Sets/src/mage/cards/a/AwesomePresence.java +++ b/Mage.Sets/src/mage/cards/a/AwesomePresence.java @@ -36,7 +36,7 @@ public final class AwesomePresence extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked unless defending player pays {3} for each creature they control that's blocking it. diff --git a/Mage.Sets/src/mage/cards/b/Backfire.java b/Mage.Sets/src/mage/cards/b/Backfire.java index 57e3fdf6cf7..494113ee4fb 100644 --- a/Mage.Sets/src/mage/cards/b/Backfire.java +++ b/Mage.Sets/src/mage/cards/b/Backfire.java @@ -30,7 +30,7 @@ public final class Backfire extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature deals damage to you, Backfire deals that much damage to that creature's controller. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new DamageAttachedControllerEffect(SavedDamageValue.MUCH), "enchanted creature", false, true, false, TargetController.YOU)); diff --git a/Mage.Sets/src/mage/cards/b/BanewaspAffliction.java b/Mage.Sets/src/mage/cards/b/BanewaspAffliction.java index 8fb9815a456..fcc025dfd26 100644 --- a/Mage.Sets/src/mage/cards/b/BanewaspAffliction.java +++ b/Mage.Sets/src/mage/cards/b/BanewaspAffliction.java @@ -34,7 +34,7 @@ public final class BanewaspAffliction extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, that creature's controller loses life equal to its toughness. diff --git a/Mage.Sets/src/mage/cards/b/BarbedField.java b/Mage.Sets/src/mage/cards/b/BarbedField.java index 67097a65c00..90b9b7ede8d 100644 --- a/Mage.Sets/src/mage/cards/b/BarbedField.java +++ b/Mage.Sets/src/mage/cards/b/BarbedField.java @@ -32,7 +32,7 @@ public final class BarbedField extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: This land deals 1 damage to any target." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BattleMastery.java b/Mage.Sets/src/mage/cards/b/BattleMastery.java index 8a8e92d3883..bf9a04053fc 100644 --- a/Mage.Sets/src/mage/cards/b/BattleMastery.java +++ b/Mage.Sets/src/mage/cards/b/BattleMastery.java @@ -27,7 +27,7 @@ public final class BattleMastery extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DoubleStrikeAbility.getInstance(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/b/BearUmbra.java b/Mage.Sets/src/mage/cards/b/BearUmbra.java index 9041e77289a..6844cc247c3 100644 --- a/Mage.Sets/src/mage/cards/b/BearUmbra.java +++ b/Mage.Sets/src/mage/cards/b/BearUmbra.java @@ -33,7 +33,7 @@ public final class BearUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 and has "Whenever this creature attacks, untap all lands you control." Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)); diff --git a/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java b/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java index 074a85e2274..04791307aba 100644 --- a/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java +++ b/Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java @@ -41,7 +41,7 @@ public final class BeastmastersMagemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1. diff --git a/Mage.Sets/src/mage/cards/b/BenevolentBlessing.java b/Mage.Sets/src/mage/cards/b/BenevolentBlessing.java index f3ef8527b29..2053edd9fa7 100644 --- a/Mage.Sets/src/mage/cards/b/BenevolentBlessing.java +++ b/Mage.Sets/src/mage/cards/b/BenevolentBlessing.java @@ -35,7 +35,7 @@ public final class BenevolentBlessing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As Benevolent Blessing enters the battlefield, choose a color. diff --git a/Mage.Sets/src/mage/cards/b/Bequeathal.java b/Mage.Sets/src/mage/cards/b/Bequeathal.java index 8478b644b85..c98402a014b 100644 --- a/Mage.Sets/src/mage/cards/b/Bequeathal.java +++ b/Mage.Sets/src/mage/cards/b/Bequeathal.java @@ -29,7 +29,7 @@ public final class Bequeathal extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, you draw two cards. diff --git a/Mage.Sets/src/mage/cards/b/BestialFury.java b/Mage.Sets/src/mage/cards/b/BestialFury.java index e8e2c5b0aef..8946f54ad4b 100644 --- a/Mage.Sets/src/mage/cards/b/BestialFury.java +++ b/Mage.Sets/src/mage/cards/b/BestialFury.java @@ -38,7 +38,7 @@ public final class BestialFury extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability enchantAbility = new EnchantAbility(auraTarget.getTargetName()); + Ability enchantAbility = new EnchantAbility(auraTarget); this.addAbility(enchantAbility); // When Bestial Fury enters the battlefield, draw a card at the beginning of the next turn's upkeep. @@ -62,4 +62,4 @@ public final class BestialFury extends CardImpl { public BestialFury copy() { return new BestialFury(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/b/Betrayal.java b/Mage.Sets/src/mage/cards/b/Betrayal.java index da2508db48e..ab0f93e69f8 100644 --- a/Mage.Sets/src/mage/cards/b/Betrayal.java +++ b/Mage.Sets/src/mage/cards/b/Betrayal.java @@ -29,7 +29,7 @@ public final class Betrayal extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature becomes tapped, you draw a card. diff --git a/Mage.Sets/src/mage/cards/b/BetrothedOfFire.java b/Mage.Sets/src/mage/cards/b/BetrothedOfFire.java index 7495bac24cf..0081b5d9329 100644 --- a/Mage.Sets/src/mage/cards/b/BetrothedOfFire.java +++ b/Mage.Sets/src/mage/cards/b/BetrothedOfFire.java @@ -43,7 +43,7 @@ public final class BetrothedOfFire extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Sacrifice an untapped creature: Enchanted creature gets +2/+0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/b/BindTheMonster.java b/Mage.Sets/src/mage/cards/b/BindTheMonster.java index f81a0a1145f..579d49a2439 100644 --- a/Mage.Sets/src/mage/cards/b/BindTheMonster.java +++ b/Mage.Sets/src/mage/cards/b/BindTheMonster.java @@ -35,7 +35,7 @@ public final class BindTheMonster extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Bind the Monster enters the battlefield, tap enchanted creature. It deals damage to you equal to its power. diff --git a/Mage.Sets/src/mage/cards/b/BindingAgony.java b/Mage.Sets/src/mage/cards/b/BindingAgony.java index f3332c069d1..c8c3ab3cac3 100644 --- a/Mage.Sets/src/mage/cards/b/BindingAgony.java +++ b/Mage.Sets/src/mage/cards/b/BindingAgony.java @@ -26,7 +26,7 @@ public final class BindingAgony extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature is dealt damage, Binding Agony deals that much damage to that creature's controller. this.addAbility(new DealtDamageAttachedTriggeredAbility(new DamageAttachedControllerEffect(SavedDamageValue.MUCH), false)); diff --git a/Mage.Sets/src/mage/cards/b/BindingGrasp.java b/Mage.Sets/src/mage/cards/b/BindingGrasp.java index d8e86fefb0c..c943ed28777 100644 --- a/Mage.Sets/src/mage/cards/b/BindingGrasp.java +++ b/Mage.Sets/src/mage/cards/b/BindingGrasp.java @@ -31,7 +31,7 @@ public final class BindingGrasp extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, sacrifice Binding Grasp unless you pay {1}{U}. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl<>("{1}{U}")), TargetController.YOU, false)); diff --git a/Mage.Sets/src/mage/cards/b/BitingTether.java b/Mage.Sets/src/mage/cards/b/BitingTether.java index b8aeb8aa998..3c9d6b6846d 100644 --- a/Mage.Sets/src/mage/cards/b/BitingTether.java +++ b/Mage.Sets/src/mage/cards/b/BitingTether.java @@ -31,7 +31,7 @@ public final class BitingTether extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/b/BlackScarab.java b/Mage.Sets/src/mage/cards/b/BlackScarab.java index b209b447d65..ad89a47bd87 100644 --- a/Mage.Sets/src/mage/cards/b/BlackScarab.java +++ b/Mage.Sets/src/mage/cards/b/BlackScarab.java @@ -43,7 +43,7 @@ public final class BlackScarab extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked by black creatures. diff --git a/Mage.Sets/src/mage/cards/b/BlackWard.java b/Mage.Sets/src/mage/cards/b/BlackWard.java index 73bd956aa21..1f8a1b08316 100644 --- a/Mage.Sets/src/mage/cards/b/BlackWard.java +++ b/Mage.Sets/src/mage/cards/b/BlackWard.java @@ -30,7 +30,7 @@ public final class BlackWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has protection from black. This effect doesn't remove Black Ward. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java index 174f420086a..9927bb684b3 100644 --- a/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java +++ b/Mage.Sets/src/mage/cards/b/BlanchwoodArmor.java @@ -34,7 +34,7 @@ public final class BlanchwoodArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter), new PermanentsOnBattlefieldCount(filter), Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/b/Blessing.java b/Mage.Sets/src/mage/cards/b/Blessing.java index fefd8a691dd..22fe5b90a20 100644 --- a/Mage.Sets/src/mage/cards/b/Blessing.java +++ b/Mage.Sets/src/mage/cards/b/Blessing.java @@ -30,7 +30,7 @@ public final class Blessing extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); // {W}: Enchanted creature gets +1/+1 until end of turn. - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java b/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java index aba19cd9ad3..4d5ded92d13 100644 --- a/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java +++ b/Mage.Sets/src/mage/cards/b/BlessingOfLeeches.java @@ -34,7 +34,7 @@ public final class BlessingOfLeeches extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Regenerate)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, you lose 1 life. diff --git a/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java b/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java index e4e55cd1e7a..a04368a3a0c 100644 --- a/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java +++ b/Mage.Sets/src/mage/cards/b/BlessingOfTheNephilim.java @@ -31,7 +31,7 @@ public final class BlessingOfTheNephilim extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 for each of its colors. diff --git a/Mage.Sets/src/mage/cards/b/Blight.java b/Mage.Sets/src/mage/cards/b/Blight.java index bf913563985..f38512ea5b8 100644 --- a/Mage.Sets/src/mage/cards/b/Blight.java +++ b/Mage.Sets/src/mage/cards/b/Blight.java @@ -30,7 +30,7 @@ public final class Blight extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted land becomes tapped, destroy it. diff --git a/Mage.Sets/src/mage/cards/b/BlindWorship.java b/Mage.Sets/src/mage/cards/b/BlindWorship.java index bcedb03a0e9..57a492d74b1 100644 --- a/Mage.Sets/src/mage/cards/b/BlindWorship.java +++ b/Mage.Sets/src/mage/cards/b/BlindWorship.java @@ -33,7 +33,7 @@ public final class BlindWorship extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever this creature attacks, each other creature you control gets +X/+X until end of turn, where X is this creature's power." diff --git a/Mage.Sets/src/mage/cards/b/BloodfireInfusion.java b/Mage.Sets/src/mage/cards/b/BloodfireInfusion.java index 896af6f4569..2d5a0f5a475 100644 --- a/Mage.Sets/src/mage/cards/b/BloodfireInfusion.java +++ b/Mage.Sets/src/mage/cards/b/BloodfireInfusion.java @@ -37,7 +37,7 @@ public final class BloodfireInfusion extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {R}, Sacrifice enchanted creature: Bloodfire Infusion deals damage equal to the sacrificed creature's power to each creature. diff --git a/Mage.Sets/src/mage/cards/b/BloodshedFever.java b/Mage.Sets/src/mage/cards/b/BloodshedFever.java index b07d4b5b343..356671b375b 100644 --- a/Mage.Sets/src/mage/cards/b/BloodshedFever.java +++ b/Mage.Sets/src/mage/cards/b/BloodshedFever.java @@ -27,7 +27,7 @@ public final class BloodshedFever extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature attacks each turn if able. diff --git a/Mage.Sets/src/mage/cards/b/BlueScarab.java b/Mage.Sets/src/mage/cards/b/BlueScarab.java index ec5b1eeb6e8..97f8f587032 100644 --- a/Mage.Sets/src/mage/cards/b/BlueScarab.java +++ b/Mage.Sets/src/mage/cards/b/BlueScarab.java @@ -43,7 +43,7 @@ public final class BlueScarab extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked by blue creatures. diff --git a/Mage.Sets/src/mage/cards/b/BlueWard.java b/Mage.Sets/src/mage/cards/b/BlueWard.java index 8c2e631858c..78ab53712dd 100644 --- a/Mage.Sets/src/mage/cards/b/BlueWard.java +++ b/Mage.Sets/src/mage/cards/b/BlueWard.java @@ -30,7 +30,7 @@ public final class BlueWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has protection from blue. This effect doesn't remove Blue Ward. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/b/BoarUmbra.java b/Mage.Sets/src/mage/cards/b/BoarUmbra.java index 1993ef6e3e3..02964e1701c 100644 --- a/Mage.Sets/src/mage/cards/b/BoarUmbra.java +++ b/Mage.Sets/src/mage/cards/b/BoarUmbra.java @@ -29,7 +29,7 @@ public final class BoarUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. diff --git a/Mage.Sets/src/mage/cards/b/BondsOfFaith.java b/Mage.Sets/src/mage/cards/b/BondsOfFaith.java index ff6b461f474..723a2da07e2 100644 --- a/Mage.Sets/src/mage/cards/b/BondsOfFaith.java +++ b/Mage.Sets/src/mage/cards/b/BondsOfFaith.java @@ -38,7 +38,7 @@ public final class BondsOfFaith extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 as long as it's a Human. Otherwise, it can't attack or block. Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java b/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java index 787edea6a04..94766afbfff 100644 --- a/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java +++ b/Mage.Sets/src/mage/cards/b/BondsOfQuicksilver.java @@ -36,7 +36,7 @@ public final class BondsOfQuicksilver extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java b/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java index 8ef21379f11..e0a36bebe42 100644 --- a/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java +++ b/Mage.Sets/src/mage/cards/b/BoonOfEmrakul.java @@ -27,7 +27,7 @@ public final class BoonOfEmrakul extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/-3. diff --git a/Mage.Sets/src/mage/cards/b/BornToDrive.java b/Mage.Sets/src/mage/cards/b/BornToDrive.java index 2463ae4378a..2f2984e0632 100644 --- a/Mage.Sets/src/mage/cards/b/BornToDrive.java +++ b/Mage.Sets/src/mage/cards/b/BornToDrive.java @@ -54,7 +54,7 @@ public final class BornToDrive extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted permanent is a creature, it gets +1/+1 for each creature and/or Vehicle you control. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java index 12ac972ffd8..1ecccce788c 100644 --- a/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java +++ b/Mage.Sets/src/mage/cards/b/BoundByMoonsilver.java @@ -40,7 +40,7 @@ public final class BoundByMoonsilver extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent can't attack, block, or transform. diff --git a/Mage.Sets/src/mage/cards/b/BoundInGold.java b/Mage.Sets/src/mage/cards/b/BoundInGold.java index b114582c84e..f51fd157f01 100644 --- a/Mage.Sets/src/mage/cards/b/BoundInGold.java +++ b/Mage.Sets/src/mage/cards/b/BoundInGold.java @@ -32,7 +32,7 @@ public final class BoundInGold extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent can't attack, block, or crew Vehicles, diff --git a/Mage.Sets/src/mage/cards/b/BoundInSilence.java b/Mage.Sets/src/mage/cards/b/BoundInSilence.java index 554f8d0893d..782710962aa 100644 --- a/Mage.Sets/src/mage/cards/b/BoundInSilence.java +++ b/Mage.Sets/src/mage/cards/b/BoundInSilence.java @@ -28,7 +28,7 @@ public final class BoundInSilence extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/b/Brainwash.java b/Mage.Sets/src/mage/cards/b/Brainwash.java index 3f21d2d2d69..8739d170403 100644 --- a/Mage.Sets/src/mage/cards/b/Brainwash.java +++ b/Mage.Sets/src/mage/cards/b/Brainwash.java @@ -30,7 +30,7 @@ public final class Brainwash extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack unless its controller pays {3}. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackUnlessPaysAttachedEffect(new ManaCostsImpl<>("{3}"), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java b/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java index 2475369ad47..e53e8b05bd8 100644 --- a/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java +++ b/Mage.Sets/src/mage/cards/b/BrandOfIllOmen.java @@ -34,7 +34,7 @@ public final class BrandOfIllOmen extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Cumulative upkeep {R} @@ -100,4 +100,4 @@ class BrandOfIllOmenEffect extends ContinuousRuleModifyingEffectImpl { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/b/Bravado.java b/Mage.Sets/src/mage/cards/b/Bravado.java index 0f96ef39fe5..a7de8887009 100644 --- a/Mage.Sets/src/mage/cards/b/Bravado.java +++ b/Mage.Sets/src/mage/cards/b/Bravado.java @@ -32,7 +32,7 @@ public final class Bravado extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 for each other creature you control. diff --git a/Mage.Sets/src/mage/cards/b/BreathOfFury.java b/Mage.Sets/src/mage/cards/b/BreathOfFury.java index 233b824ca6d..227c7691e08 100644 --- a/Mage.Sets/src/mage/cards/b/BreathOfFury.java +++ b/Mage.Sets/src/mage/cards/b/BreathOfFury.java @@ -36,7 +36,7 @@ public final class BreathOfFury extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature deals combat damage to a player, sacrifice it and attach Breath of Fury to a creature you control. If you do, untap all creatures you control and after this phase, there is an additional combat phase. diff --git a/Mage.Sets/src/mage/cards/b/BriarShield.java b/Mage.Sets/src/mage/cards/b/BriarShield.java index 11ed6243f54..f5606220c67 100644 --- a/Mage.Sets/src/mage/cards/b/BriarShield.java +++ b/Mage.Sets/src/mage/cards/b/BriarShield.java @@ -29,7 +29,7 @@ public final class BriarShield extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/b/BrilliantHalo.java b/Mage.Sets/src/mage/cards/b/BrilliantHalo.java index 86fe34c7e3a..f814b252ada 100644 --- a/Mage.Sets/src/mage/cards/b/BrilliantHalo.java +++ b/Mage.Sets/src/mage/cards/b/BrilliantHalo.java @@ -30,7 +30,7 @@ public final class BrilliantHalo extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/b/BrineboundGift.java b/Mage.Sets/src/mage/cards/b/BrineboundGift.java index 17e94aa84d9..530f797aa62 100644 --- a/Mage.Sets/src/mage/cards/b/BrineboundGift.java +++ b/Mage.Sets/src/mage/cards/b/BrineboundGift.java @@ -40,7 +40,7 @@ public final class BrineboundGift extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever Brinebound Gift enters the battlefield or enchanted creature becomes the target of an Aura spell, create a 1/1 white Spirit creature token with flying. diff --git a/Mage.Sets/src/mage/cards/b/BrinkOfDisaster.java b/Mage.Sets/src/mage/cards/b/BrinkOfDisaster.java index 342113fa044..47fd40806bf 100644 --- a/Mage.Sets/src/mage/cards/b/BrinkOfDisaster.java +++ b/Mage.Sets/src/mage/cards/b/BrinkOfDisaster.java @@ -39,7 +39,7 @@ public final class BrinkOfDisaster extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted permanent becomes tapped, destroy it. diff --git a/Mage.Sets/src/mage/cards/b/BronzehideLion.java b/Mage.Sets/src/mage/cards/b/BronzehideLion.java index e252f441772..6cc85e14865 100644 --- a/Mage.Sets/src/mage/cards/b/BronzehideLion.java +++ b/Mage.Sets/src/mage/cards/b/BronzehideLion.java @@ -161,7 +161,7 @@ class BronzehideLionContinuousEffect extends ContinuousEffectImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); lion.getSpellAbility().addTarget(auraTarget); lion.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - lion.addAbility(new EnchantAbility(auraTarget.getTargetName()), source.getSourceId(), game); + lion.addAbility(new EnchantAbility(auraTarget), source.getSourceId(), game); // add the activated ability activatedAbility.setControllerId(source.getControllerId()); diff --git a/Mage.Sets/src/mage/cards/b/BubbleSnare.java b/Mage.Sets/src/mage/cards/b/BubbleSnare.java index a519600ad40..74c45a6bd19 100644 --- a/Mage.Sets/src/mage/cards/b/BubbleSnare.java +++ b/Mage.Sets/src/mage/cards/b/BubbleSnare.java @@ -37,7 +37,7 @@ public final class BubbleSnare extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Bubble Snare enters the battlefield, if it was kicked, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/b/Buoyancy.java b/Mage.Sets/src/mage/cards/b/Buoyancy.java index aab0193e113..6b619cb403f 100644 --- a/Mage.Sets/src/mage/cards/b/Buoyancy.java +++ b/Mage.Sets/src/mage/cards/b/Buoyancy.java @@ -33,7 +33,7 @@ public final class Buoyancy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. diff --git a/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java b/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java index 5f783f5aafc..a9ef35c61db 100644 --- a/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java +++ b/Mage.Sets/src/mage/cards/b/BurdenOfGuilt.java @@ -32,7 +32,7 @@ public final class BurdenOfGuilt extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {1}: Tap enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new GenericManaCost(1))); diff --git a/Mage.Sets/src/mage/cards/b/BurningAnger.java b/Mage.Sets/src/mage/cards/b/BurningAnger.java index 20a805c0f79..81ca8d69c6b 100644 --- a/Mage.Sets/src/mage/cards/b/BurningAnger.java +++ b/Mage.Sets/src/mage/cards/b/BurningAnger.java @@ -34,7 +34,7 @@ public final class BurningAnger extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{T}: This creature deals damage equal to its power to any target." diff --git a/Mage.Sets/src/mage/cards/b/Burrowing.java b/Mage.Sets/src/mage/cards/b/Burrowing.java index bc846acc1d9..fcaa926c749 100644 --- a/Mage.Sets/src/mage/cards/b/Burrowing.java +++ b/Mage.Sets/src/mage/cards/b/Burrowing.java @@ -30,7 +30,7 @@ public final class Burrowing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has mountainwalk. @@ -46,4 +46,4 @@ public final class Burrowing extends CardImpl { public Burrowing copy() { return new Burrowing(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CageOfHands.java b/Mage.Sets/src/mage/cards/c/CageOfHands.java index 7e6bc90d06e..4caf1f8800e 100644 --- a/Mage.Sets/src/mage/cards/c/CageOfHands.java +++ b/Mage.Sets/src/mage/cards/c/CageOfHands.java @@ -32,7 +32,7 @@ public final class CageOfHands extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. diff --git a/Mage.Sets/src/mage/cards/c/Cagemail.java b/Mage.Sets/src/mage/cards/c/Cagemail.java index 0f5eacbc82e..8e2d8522bd3 100644 --- a/Mage.Sets/src/mage/cards/c/Cagemail.java +++ b/Mage.Sets/src/mage/cards/c/Cagemail.java @@ -29,7 +29,7 @@ public final class Cagemail extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and can't attack. Ability ability1 = new SimpleStaticAbility(new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java b/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java index 85a4245d466..7798edcb5a2 100644 --- a/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java +++ b/Mage.Sets/src/mage/cards/c/CallOfTheFullMoon.java @@ -36,7 +36,7 @@ public final class CallOfTheFullMoon extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+2 and has trample. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 2, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/c/CallToServe.java b/Mage.Sets/src/mage/cards/c/CallToServe.java index 0c6379ff33a..0e4c7db1ec8 100644 --- a/Mage.Sets/src/mage/cards/c/CallToServe.java +++ b/Mage.Sets/src/mage/cards/c/CallToServe.java @@ -31,7 +31,7 @@ public final class CallToServe extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(StaticFilters.FILTER_PERMANENT_CREATURE_NON_BLACK); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2, has flying, and is an Angel in addition to its other types. diff --git a/Mage.Sets/src/mage/cards/c/CallToTheKindred.java b/Mage.Sets/src/mage/cards/c/CallToTheKindred.java index 27894b52efe..614e841f523 100644 --- a/Mage.Sets/src/mage/cards/c/CallToTheKindred.java +++ b/Mage.Sets/src/mage/cards/c/CallToTheKindred.java @@ -36,7 +36,7 @@ public final class CallToTheKindred extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of your upkeep, you may look at the top five cards of your library. // If you do, you may put a creature card that shares a creature type with enchanted creature from among them onto the battlefield, diff --git a/Mage.Sets/src/mage/cards/c/CandlelightVigil.java b/Mage.Sets/src/mage/cards/c/CandlelightVigil.java index 971c2707898..fda0ebbd194 100644 --- a/Mage.Sets/src/mage/cards/c/CandlelightVigil.java +++ b/Mage.Sets/src/mage/cards/c/CandlelightVigil.java @@ -34,7 +34,7 @@ public final class CandlelightVigil extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+2 and has vigilance. diff --git a/Mage.Sets/src/mage/cards/c/Candletrap.java b/Mage.Sets/src/mage/cards/c/Candletrap.java index 507cee13298..4c580dceb43 100644 --- a/Mage.Sets/src/mage/cards/c/Candletrap.java +++ b/Mage.Sets/src/mage/cards/c/Candletrap.java @@ -36,7 +36,7 @@ public final class Candletrap extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has defender. diff --git a/Mage.Sets/src/mage/cards/c/CanopyCover.java b/Mage.Sets/src/mage/cards/c/CanopyCover.java index a07ba372567..8f5d35cf600 100644 --- a/Mage.Sets/src/mage/cards/c/CanopyCover.java +++ b/Mage.Sets/src/mage/cards/c/CanopyCover.java @@ -45,7 +45,7 @@ public final class CanopyCover extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked except by creatures with flying or reach. (!this is a static ability of the enchantment) diff --git a/Mage.Sets/src/mage/cards/c/CapashenStandard.java b/Mage.Sets/src/mage/cards/c/CapashenStandard.java index 634e26eec14..8e11f88f5ef 100644 --- a/Mage.Sets/src/mage/cards/c/CapashenStandard.java +++ b/Mage.Sets/src/mage/cards/c/CapashenStandard.java @@ -35,7 +35,7 @@ public final class CapashenStandard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/c/CaptivatingGlance.java b/Mage.Sets/src/mage/cards/c/CaptivatingGlance.java index ee5e78824ea..2a5b5697c33 100644 --- a/Mage.Sets/src/mage/cards/c/CaptivatingGlance.java +++ b/Mage.Sets/src/mage/cards/c/CaptivatingGlance.java @@ -38,7 +38,7 @@ public final class CaptivatingGlance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your end step, clash with an opponent. If you win, gain control of enchanted creature. Otherwise, that player gains control of enchanted creature. diff --git a/Mage.Sets/src/mage/cards/c/CaptureSphere.java b/Mage.Sets/src/mage/cards/c/CaptureSphere.java index b619ed2aed2..e7f28f9f537 100644 --- a/Mage.Sets/src/mage/cards/c/CaptureSphere.java +++ b/Mage.Sets/src/mage/cards/c/CaptureSphere.java @@ -36,7 +36,7 @@ public final class CaptureSphere extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Capture Sphere enters the battlefield, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/c/CapturedByLagacs.java b/Mage.Sets/src/mage/cards/c/CapturedByLagacs.java index e0b0c66e398..5b6b7b1182a 100644 --- a/Mage.Sets/src/mage/cards/c/CapturedByLagacs.java +++ b/Mage.Sets/src/mage/cards/c/CapturedByLagacs.java @@ -31,7 +31,7 @@ public final class CapturedByLagacs extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. diff --git a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java index 1156466cb06..4deae3cbd2d 100644 --- a/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java +++ b/Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java @@ -39,7 +39,7 @@ public final class CapturedByTheConsulate extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. diff --git a/Mage.Sets/src/mage/cards/c/Carapace.java b/Mage.Sets/src/mage/cards/c/Carapace.java index 0dbb77bc768..87eb9e9a19d 100644 --- a/Mage.Sets/src/mage/cards/c/Carapace.java +++ b/Mage.Sets/src/mage/cards/c/Carapace.java @@ -30,7 +30,7 @@ public final class Carapace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/c/CarboniteChamber.java b/Mage.Sets/src/mage/cards/c/CarboniteChamber.java index 220ef5d3e97..d9d6d8a5c5c 100644 --- a/Mage.Sets/src/mage/cards/c/CarboniteChamber.java +++ b/Mage.Sets/src/mage/cards/c/CarboniteChamber.java @@ -34,7 +34,7 @@ public final class CarboniteChamber extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Carbonite Chamber enters the battlefield, you may remove a bounty counter from target creature. diff --git a/Mage.Sets/src/mage/cards/c/CarefulCultivation.java b/Mage.Sets/src/mage/cards/c/CarefulCultivation.java index 31cfd3d91e5..7bfcf493aca 100644 --- a/Mage.Sets/src/mage/cards/c/CarefulCultivation.java +++ b/Mage.Sets/src/mage/cards/c/CarefulCultivation.java @@ -40,7 +40,7 @@ public final class CarefulCultivation extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted permanent is a creature, it gets +1/+3 and has reach and "{T}: Add {G}{G}." Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/c/CaribouRange.java b/Mage.Sets/src/mage/cards/c/CaribouRange.java index a1beb5890e9..0c27bafeefe 100644 --- a/Mage.Sets/src/mage/cards/c/CaribouRange.java +++ b/Mage.Sets/src/mage/cards/c/CaribouRange.java @@ -45,7 +45,7 @@ public final class CaribouRange extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(new FilterControlledLandPermanent()); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{W}{W}, {T}: Create a 0/1 white Caribou creature token." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new CaribouToken()), new ManaCostsImpl<>("{W}{W}")); diff --git a/Mage.Sets/src/mage/cards/c/CarryAway.java b/Mage.Sets/src/mage/cards/c/CarryAway.java index 34af274a941..57a70facd7e 100644 --- a/Mage.Sets/src/mage/cards/c/CarryAway.java +++ b/Mage.Sets/src/mage/cards/c/CarryAway.java @@ -35,7 +35,7 @@ public final class CarryAway extends CardImpl { TargetPermanent auraTarget = new TargetEquipmentPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Carry Away enters the battlefield, unattach enchanted Equipment. diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfAmbition.java b/Mage.Sets/src/mage/cards/c/CartoucheOfAmbition.java index 2564793476b..f993b3d1f0c 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfAmbition.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfAmbition.java @@ -36,7 +36,7 @@ public final class CartoucheOfAmbition extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Cartouche of Ambition enters the battlefield, you may put a -1/-1 counter on target creature. diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfKnowledge.java b/Mage.Sets/src/mage/cards/c/CartoucheOfKnowledge.java index 6c68403b6a9..17362e636bf 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfKnowledge.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfKnowledge.java @@ -34,7 +34,7 @@ public final class CartoucheOfKnowledge extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Cartouche of Knowledge enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfSolidarity.java b/Mage.Sets/src/mage/cards/c/CartoucheOfSolidarity.java index c434ad801b8..7273228be64 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfSolidarity.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfSolidarity.java @@ -35,7 +35,7 @@ public final class CartoucheOfSolidarity extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Cartouche of Solidarity enters the battlefield, create a 1/1 white Warrior creature token with vigilance. diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfStrength.java b/Mage.Sets/src/mage/cards/c/CartoucheOfStrength.java index 753feadaddc..8cd6b2d7317 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfStrength.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfStrength.java @@ -38,7 +38,7 @@ public final class CartoucheOfStrength extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Cartouche of Strength enters the battlefield, you may have enchanted creature fight target creature an opponent controls. @@ -108,4 +108,4 @@ class FightEnchantedTargetEffect extends OneShotEffect { public FightEnchantedTargetEffect copy() { return new FightEnchantedTargetEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CartoucheOfZeal.java b/Mage.Sets/src/mage/cards/c/CartoucheOfZeal.java index a18e90a769b..36f23b6cf8c 100644 --- a/Mage.Sets/src/mage/cards/c/CartoucheOfZeal.java +++ b/Mage.Sets/src/mage/cards/c/CartoucheOfZeal.java @@ -35,7 +35,7 @@ public final class CartoucheOfZeal extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Cartouche of Zeal enters the battlefield, target creature can't block this turn. diff --git a/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java b/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java index 2504d1ab8c7..d4d0c54ca65 100644 --- a/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java +++ b/Mage.Sets/src/mage/cards/c/CastIntoDarkness.java @@ -30,7 +30,7 @@ public final class CastIntoDarkness extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-0 and can't block. diff --git a/Mage.Sets/src/mage/cards/c/CastawaysDespair.java b/Mage.Sets/src/mage/cards/c/CastawaysDespair.java index 6c33af698c8..7870389ca9d 100644 --- a/Mage.Sets/src/mage/cards/c/CastawaysDespair.java +++ b/Mage.Sets/src/mage/cards/c/CastawaysDespair.java @@ -33,7 +33,7 @@ public final class CastawaysDespair extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Castaway's Despair enters the battlefield, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/c/CastingOfBones.java b/Mage.Sets/src/mage/cards/c/CastingOfBones.java index 41a08440a67..c6ea91b1aa1 100644 --- a/Mage.Sets/src/mage/cards/c/CastingOfBones.java +++ b/Mage.Sets/src/mage/cards/c/CastingOfBones.java @@ -30,7 +30,7 @@ public final class CastingOfBones extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, draw three cards, then discard one of them. diff --git a/Mage.Sets/src/mage/cards/c/CatharsCall.java b/Mage.Sets/src/mage/cards/c/CatharsCall.java index 0dcbf8b25df..4e6037962fa 100644 --- a/Mage.Sets/src/mage/cards/c/CatharsCall.java +++ b/Mage.Sets/src/mage/cards/c/CatharsCall.java @@ -31,7 +31,7 @@ public final class CatharsCall extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has vigilance and "At the beginning of your end step, create a 1/1 white Human creature token." diff --git a/Mage.Sets/src/mage/cards/c/CatlikeCuriosity.java b/Mage.Sets/src/mage/cards/c/CatlikeCuriosity.java index 9bd5e6aa4c7..932763c5175 100644 --- a/Mage.Sets/src/mage/cards/c/CatlikeCuriosity.java +++ b/Mage.Sets/src/mage/cards/c/CatlikeCuriosity.java @@ -36,7 +36,7 @@ public final class CatlikeCuriosity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever this creature deals combat damage to a player, draw a card." diff --git a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java index cb593ab1d96..f33f2284a78 100644 --- a/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java +++ b/Mage.Sets/src/mage/cards/c/CaughtInTheBrights.java @@ -37,7 +37,7 @@ public final class CaughtInTheBrights extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. diff --git a/Mage.Sets/src/mage/cards/c/CausticTar.java b/Mage.Sets/src/mage/cards/c/CausticTar.java index 2ba0fa1cb52..faf14ceefde 100644 --- a/Mage.Sets/src/mage/cards/c/CausticTar.java +++ b/Mage.Sets/src/mage/cards/c/CausticTar.java @@ -32,7 +32,7 @@ public final class CausticTar extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Target player loses 3 life." diff --git a/Mage.Sets/src/mage/cards/c/CaveSense.java b/Mage.Sets/src/mage/cards/c/CaveSense.java index 57acb0f98c6..c523159b88c 100644 --- a/Mage.Sets/src/mage/cards/c/CaveSense.java +++ b/Mage.Sets/src/mage/cards/c/CaveSense.java @@ -34,7 +34,7 @@ public final class CaveSense extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has mountainwalk. diff --git a/Mage.Sets/src/mage/cards/c/CelestialMantle.java b/Mage.Sets/src/mage/cards/c/CelestialMantle.java index 9168ea66241..20fbf3bb016 100644 --- a/Mage.Sets/src/mage/cards/c/CelestialMantle.java +++ b/Mage.Sets/src/mage/cards/c/CelestialMantle.java @@ -39,7 +39,7 @@ public final class CelestialMantle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. diff --git a/Mage.Sets/src/mage/cards/c/Cessation.java b/Mage.Sets/src/mage/cards/c/Cessation.java index 62449dde81c..86b9875a8e9 100644 --- a/Mage.Sets/src/mage/cards/c/Cessation.java +++ b/Mage.Sets/src/mage/cards/c/Cessation.java @@ -28,7 +28,7 @@ public final class Cessation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); //Enchanted creature can't attack. diff --git a/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java b/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java index 879ebaee497..cb19b8605d2 100644 --- a/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java +++ b/Mage.Sets/src/mage/cards/c/ChainedToTheRocks.java @@ -37,7 +37,7 @@ public final class ChainedToTheRocks extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Exile)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Chained to the Rocks enters the battlefield, exile target creature an opponent controls until Chained to the Rocks leaves the battlefield. (That creature returns under its owner's control.) diff --git a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java index 46ef7a69772..8cb63f4a8f6 100644 --- a/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java +++ b/Mage.Sets/src/mage/cards/c/ChamberOfManipulation.java @@ -34,7 +34,7 @@ public final class ChamberOfManipulation extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}, Discard a card: Gain control of target creature until end of turn." diff --git a/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java b/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java index 8f786f986af..845d8786dfa 100644 --- a/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java +++ b/Mage.Sets/src/mage/cards/c/ChantOfTheSkifsang.java @@ -31,7 +31,7 @@ public final class ChantOfTheSkifsang extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -13/-0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-13, 0, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/c/Charisma.java b/Mage.Sets/src/mage/cards/c/Charisma.java index b2c7bcc4045..9dba45f5d1a 100644 --- a/Mage.Sets/src/mage/cards/c/Charisma.java +++ b/Mage.Sets/src/mage/cards/c/Charisma.java @@ -36,7 +36,7 @@ public final class Charisma extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature deals damage to a creature, gain control of the other creature for as long as Charisma remains on the battlefield. diff --git a/Mage.Sets/src/mage/cards/c/CharmedSleep.java b/Mage.Sets/src/mage/cards/c/CharmedSleep.java index 41daf61253a..97771ccb0d5 100644 --- a/Mage.Sets/src/mage/cards/c/CharmedSleep.java +++ b/Mage.Sets/src/mage/cards/c/CharmedSleep.java @@ -31,7 +31,7 @@ public final class CharmedSleep extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Charmed Sleep enters the battlefield, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/c/ChimeOfNight.java b/Mage.Sets/src/mage/cards/c/ChimeOfNight.java index 78da0f9f66f..f9dba35d3ad 100644 --- a/Mage.Sets/src/mage/cards/c/ChimeOfNight.java +++ b/Mage.Sets/src/mage/cards/c/ChimeOfNight.java @@ -30,7 +30,7 @@ public final class ChimeOfNight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Chime of Night is put into a graveyard from the battlefield, destroy target nonblack creature. diff --git a/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java b/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java index beec347f840..9117ef8469a 100644 --- a/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java +++ b/Mage.Sets/src/mage/cards/c/ChoMannosBlessing.java @@ -35,7 +35,7 @@ public final class ChoMannosBlessing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As Cho-Manno's Blessing enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); diff --git a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java index 3beea0dbdaf..a1295bfbc2b 100644 --- a/Mage.Sets/src/mage/cards/c/ChokingRestraints.java +++ b/Mage.Sets/src/mage/cards/c/ChokingRestraints.java @@ -35,7 +35,7 @@ public final class ChokingRestraints extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java b/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java index d52c2c8394c..95ff44fe0a1 100644 --- a/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java +++ b/Mage.Sets/src/mage/cards/c/ChosenByHeliod.java @@ -34,7 +34,7 @@ public final class ChosenByHeliod extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Chosen by Heliod enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/c/ChronicFlooding.java b/Mage.Sets/src/mage/cards/c/ChronicFlooding.java index 825861a8eda..1bede5dee36 100644 --- a/Mage.Sets/src/mage/cards/c/ChronicFlooding.java +++ b/Mage.Sets/src/mage/cards/c/ChronicFlooding.java @@ -38,7 +38,7 @@ public final class ChronicFlooding extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land becomes tapped, its controller puts the top three cards of their library into their graveyard. @@ -93,4 +93,4 @@ class ChronicFloodingAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever enchanted land becomes tapped, its controller mills three cards."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java index 45b4452a8f5..c0cf04cedbd 100644 --- a/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java +++ b/Mage.Sets/src/mage/cards/c/ClaimOfErebos.java @@ -33,7 +33,7 @@ public final class ClaimOfErebos extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{1}{B}, {T}: Target player loses 2 life." Ability grantedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), new ManaCostsImpl<>("{1}{B}")); diff --git a/Mage.Sets/src/mage/cards/c/Claustrophobia.java b/Mage.Sets/src/mage/cards/c/Claustrophobia.java index a1bd9617451..3af7c79b008 100644 --- a/Mage.Sets/src/mage/cards/c/Claustrophobia.java +++ b/Mage.Sets/src/mage/cards/c/Claustrophobia.java @@ -31,7 +31,7 @@ public final class Claustrophobia extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Claustrophobia enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/c/ClawingTorment.java b/Mage.Sets/src/mage/cards/c/ClawingTorment.java index abaf3b95e2a..9558f2a51c8 100644 --- a/Mage.Sets/src/mage/cards/c/ClawingTorment.java +++ b/Mage.Sets/src/mage/cards/c/ClawingTorment.java @@ -37,7 +37,7 @@ public final class ClawingTorment extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted permanent is a creature, it gets -1/-1 and can't block. Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java index ab25ad766ce..3c227803c91 100644 --- a/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java +++ b/Mage.Sets/src/mage/cards/c/ClawsOfValakut.java @@ -38,7 +38,7 @@ public final class ClawsOfValakut extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(new PermanentsOnBattlefieldCount(filter, 1), new PermanentsOnBattlefieldCount(filter, 0), Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/c/CleverDistraction.java b/Mage.Sets/src/mage/cards/c/CleverDistraction.java index aca1c3e7953..988dc74a63f 100644 --- a/Mage.Sets/src/mage/cards/c/CleverDistraction.java +++ b/Mage.Sets/src/mage/cards/c/CleverDistraction.java @@ -46,7 +46,7 @@ public final class CleverDistraction extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever this creature attacks, tap target creature defending player controls." diff --git a/Mage.Sets/src/mage/cards/c/ClingingDarkness.java b/Mage.Sets/src/mage/cards/c/ClingingDarkness.java index 6c10dbb489e..c51155c2cb5 100644 --- a/Mage.Sets/src/mage/cards/c/ClingingDarkness.java +++ b/Mage.Sets/src/mage/cards/c/ClingingDarkness.java @@ -31,7 +31,7 @@ public final class ClingingDarkness extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -4/-1. diff --git a/Mage.Sets/src/mage/cards/c/CloakOfConfusion.java b/Mage.Sets/src/mage/cards/c/CloakOfConfusion.java index 65694193d22..d7a30cc9ac7 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfConfusion.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfConfusion.java @@ -34,7 +34,7 @@ public final class CloakOfConfusion extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks and isn't blocked, you may have it assign no combat damage this turn. diff --git a/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java b/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java index ce47f8752f3..3107cedbe01 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfInvisibility.java @@ -35,7 +35,7 @@ public final class CloakOfInvisibility extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has phasing and can't be blocked except by Walls. diff --git a/Mage.Sets/src/mage/cards/c/CloakOfMists.java b/Mage.Sets/src/mage/cards/c/CloakOfMists.java index c431c81d489..9580d79635a 100644 --- a/Mage.Sets/src/mage/cards/c/CloakOfMists.java +++ b/Mage.Sets/src/mage/cards/c/CloakOfMists.java @@ -31,7 +31,7 @@ public final class CloakOfMists extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't be blocked. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedAttachedEffect(AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/c/CloakingDevice.java b/Mage.Sets/src/mage/cards/c/CloakingDevice.java index 5b1f101ef16..f192d8c2ef7 100644 --- a/Mage.Sets/src/mage/cards/c/CloakingDevice.java +++ b/Mage.Sets/src/mage/cards/c/CloakingDevice.java @@ -28,7 +28,7 @@ public final class CloakingDevice extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked. diff --git a/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java b/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java index 95a91992a60..86672d22527 100644 --- a/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java +++ b/Mage.Sets/src/mage/cards/c/CloutOfTheDominus.java @@ -38,7 +38,7 @@ public final class CloutOfTheDominus extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is blue, it gets +1/+1 and has shroud. SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java b/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java index f7247ac0c57..a7f00563f31 100644 --- a/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java +++ b/Mage.Sets/src/mage/cards/c/ClutchOfUndeath.java @@ -33,7 +33,7 @@ public final class ClutchOfUndeath extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 as long as it's a Zombie. Otherwise, it gets -3/-3. diff --git a/Mage.Sets/src/mage/cards/c/CoalitionFlag.java b/Mage.Sets/src/mage/cards/c/CoalitionFlag.java index d683343c4c8..7d8ef1bfef0 100644 --- a/Mage.Sets/src/mage/cards/c/CoalitionFlag.java +++ b/Mage.Sets/src/mage/cards/c/CoalitionFlag.java @@ -29,7 +29,7 @@ public final class CoalitionFlag extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature is a Flagbearer. diff --git a/Mage.Sets/src/mage/cards/c/Cocoon.java b/Mage.Sets/src/mage/cards/c/Cocoon.java index 0aa82c9c9b8..8fd856c0b94 100644 --- a/Mage.Sets/src/mage/cards/c/Cocoon.java +++ b/Mage.Sets/src/mage/cards/c/Cocoon.java @@ -42,7 +42,7 @@ public final class Cocoon extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Cocoon enters the battlefield, tap enchanted creature and put three pupa counters on Cocoon. Ability ability = new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect()); diff --git a/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java b/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java index bd7437a15ad..76e5041c65c 100644 --- a/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java +++ b/Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java @@ -35,7 +35,7 @@ public final class CoilsOfTheMedusa extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/-1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, -1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/c/Colossification.java b/Mage.Sets/src/mage/cards/c/Colossification.java index f76cc33b74a..0034bfde90c 100644 --- a/Mage.Sets/src/mage/cards/c/Colossification.java +++ b/Mage.Sets/src/mage/cards/c/Colossification.java @@ -31,7 +31,7 @@ public final class Colossification extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Colossification enters the battlefield, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/c/ComaVeil.java b/Mage.Sets/src/mage/cards/c/ComaVeil.java index 481f81f05ec..9457890dc73 100644 --- a/Mage.Sets/src/mage/cards/c/ComaVeil.java +++ b/Mage.Sets/src/mage/cards/c/ComaVeil.java @@ -38,7 +38,7 @@ public final class ComaVeil extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - EnchantAbility ability = new EnchantAbility(auraTarget.getTargetName()); + EnchantAbility ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/c/CombatResearch.java b/Mage.Sets/src/mage/cards/c/CombatResearch.java index a0c793e4cc3..9aae25021a9 100644 --- a/Mage.Sets/src/mage/cards/c/CombatResearch.java +++ b/Mage.Sets/src/mage/cards/c/CombatResearch.java @@ -42,7 +42,7 @@ public final class CombatResearch extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "Whenever this creature deals combat damage to a player, draw a card." this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/c/CommandersAuthority.java b/Mage.Sets/src/mage/cards/c/CommandersAuthority.java index b8131cd48f8..1aa304b00fd 100644 --- a/Mage.Sets/src/mage/cards/c/CommandersAuthority.java +++ b/Mage.Sets/src/mage/cards/c/CommandersAuthority.java @@ -31,7 +31,7 @@ public final class CommandersAuthority extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "At the beginning of your upkeep, create a 1/1 white Human creature token." ability = new BeginningOfUpkeepTriggeredAbility(new CreateTokenEffect(new HumanToken()), TargetController.YOU, false); diff --git a/Mage.Sets/src/mage/cards/c/CommandingPresence.java b/Mage.Sets/src/mage/cards/c/CommandingPresence.java index c6443d3529e..090b3a535fe 100644 --- a/Mage.Sets/src/mage/cards/c/CommandingPresence.java +++ b/Mage.Sets/src/mage/cards/c/CommandingPresence.java @@ -32,7 +32,7 @@ public final class CommandingPresence extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has first strike and "Whenever this creature deals combat damage to a player, create a 1/1 white Human Soldier creature token." diff --git a/Mage.Sets/src/mage/cards/c/CompulsoryRest.java b/Mage.Sets/src/mage/cards/c/CompulsoryRest.java index 1279dfc5dee..a04c371b035 100644 --- a/Mage.Sets/src/mage/cards/c/CompulsoryRest.java +++ b/Mage.Sets/src/mage/cards/c/CompulsoryRest.java @@ -39,7 +39,7 @@ public final class CompulsoryRest extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. diff --git a/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java b/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java index 550f276cefa..38a77ee0f46 100644 --- a/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java +++ b/Mage.Sets/src/mage/cards/c/ConclavesBlessing.java @@ -44,7 +44,7 @@ public final class ConclavesBlessing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +0/+2 for each other creature you control. PermanentsOnBattlefieldCount value = new PermanentsOnBattlefieldCount(filter, 2); diff --git a/Mage.Sets/src/mage/cards/c/Confiscate.java b/Mage.Sets/src/mage/cards/c/Confiscate.java index 737e3907fa1..1658f300fe6 100644 --- a/Mage.Sets/src/mage/cards/c/Confiscate.java +++ b/Mage.Sets/src/mage/cards/c/Confiscate.java @@ -30,7 +30,7 @@ public final class Confiscate extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted permanent. diff --git a/Mage.Sets/src/mage/cards/c/Conquer.java b/Mage.Sets/src/mage/cards/c/Conquer.java index 2dcb5bf71a4..5aab955e270 100644 --- a/Mage.Sets/src/mage/cards/c/Conquer.java +++ b/Mage.Sets/src/mage/cards/c/Conquer.java @@ -31,7 +31,7 @@ public final class Conquer extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted land. diff --git a/Mage.Sets/src/mage/cards/c/ConsecrateLand.java b/Mage.Sets/src/mage/cards/c/ConsecrateLand.java index 6c9e5e82108..3d880ef7c31 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecrateLand.java +++ b/Mage.Sets/src/mage/cards/c/ConsecrateLand.java @@ -34,7 +34,7 @@ public final class ConsecrateLand extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is indestructible and can't be enchanted by other Auras. diff --git a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java index 1c7ef9daa7e..cbfe1fcfa9f 100644 --- a/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java +++ b/Mage.Sets/src/mage/cards/c/ConsecratedByBlood.java @@ -43,7 +43,7 @@ public final class ConsecratedByBlood extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying and "Sacrifice two other creatures: Regenerate this creature." ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java b/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java index 86f67aa44bd..e11f95bcddf 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingFerocity.java @@ -44,7 +44,7 @@ public final class ConsumingFerocity extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0. diff --git a/Mage.Sets/src/mage/cards/c/ConsumingFervor.java b/Mage.Sets/src/mage/cards/c/ConsumingFervor.java index 0b6e5720b12..caeb9035564 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingFervor.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingFervor.java @@ -39,7 +39,7 @@ public final class ConsumingFervor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and has "At the beginning of your upkeep, put a -1/-1 counter on this creature." diff --git a/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java b/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java index 5956a74be82..730c44b1c8e 100644 --- a/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java +++ b/Mage.Sets/src/mage/cards/c/ContainmentMembrane.java @@ -31,7 +31,7 @@ public final class ContainmentMembrane extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/c/ContaminatedBond.java b/Mage.Sets/src/mage/cards/c/ContaminatedBond.java index d95d30ad11f..e4bd5961f07 100644 --- a/Mage.Sets/src/mage/cards/c/ContaminatedBond.java +++ b/Mage.Sets/src/mage/cards/c/ContaminatedBond.java @@ -27,7 +27,7 @@ public final class ContaminatedBond extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks or blocks, its controller loses 3 life. diff --git a/Mage.Sets/src/mage/cards/c/ContaminatedGround.java b/Mage.Sets/src/mage/cards/c/ContaminatedGround.java index 8fcd183882c..ea3f3622f47 100644 --- a/Mage.Sets/src/mage/cards/c/ContaminatedGround.java +++ b/Mage.Sets/src/mage/cards/c/ContaminatedGround.java @@ -33,7 +33,7 @@ public final class ContaminatedGround extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is a Swamp. diff --git a/Mage.Sets/src/mage/cards/c/Contempt.java b/Mage.Sets/src/mage/cards/c/Contempt.java index b6894e7330f..84ab26c44f2 100644 --- a/Mage.Sets/src/mage/cards/c/Contempt.java +++ b/Mage.Sets/src/mage/cards/c/Contempt.java @@ -36,7 +36,7 @@ public final class Contempt extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, return it and Contempt to their owners' hands at end of combat. diff --git a/Mage.Sets/src/mage/cards/c/ControlMagic.java b/Mage.Sets/src/mage/cards/c/ControlMagic.java index 8e58584738a..123eb9438d2 100644 --- a/Mage.Sets/src/mage/cards/c/ControlMagic.java +++ b/Mage.Sets/src/mage/cards/c/ControlMagic.java @@ -29,7 +29,7 @@ public final class ControlMagic extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/c/ControlledInstincts.java b/Mage.Sets/src/mage/cards/c/ControlledInstincts.java index 3ce09eba803..5b44bade4e3 100644 --- a/Mage.Sets/src/mage/cards/c/ControlledInstincts.java +++ b/Mage.Sets/src/mage/cards/c/ControlledInstincts.java @@ -42,7 +42,7 @@ public final class ControlledInstincts extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/Conviction.java b/Mage.Sets/src/mage/cards/c/Conviction.java index f3339222029..35112ca0f8d 100644 --- a/Mage.Sets/src/mage/cards/c/Conviction.java +++ b/Mage.Sets/src/mage/cards/c/Conviction.java @@ -34,7 +34,7 @@ public final class Conviction extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+3. diff --git a/Mage.Sets/src/mage/cards/c/ConvincingMirage.java b/Mage.Sets/src/mage/cards/c/ConvincingMirage.java index 75d32475920..a4f7264d18a 100644 --- a/Mage.Sets/src/mage/cards/c/ConvincingMirage.java +++ b/Mage.Sets/src/mage/cards/c/ConvincingMirage.java @@ -36,7 +36,7 @@ public final class ConvincingMirage extends CardImpl { this.addAbility(new AsEntersBattlefieldAbility(new ChooseBasicLandTypeEffect(Outcome.Neutral))); // Enchanted land is the chosen type. - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConvincingMirageContinousEffect())); } diff --git a/Mage.Sets/src/mage/cards/c/Cooperation.java b/Mage.Sets/src/mage/cards/c/Cooperation.java index 690c446458e..5583ebb1979 100644 --- a/Mage.Sets/src/mage/cards/c/Cooperation.java +++ b/Mage.Sets/src/mage/cards/c/Cooperation.java @@ -32,7 +32,7 @@ public final class Cooperation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has banding. diff --git a/Mage.Sets/src/mage/cards/c/CoralNet.java b/Mage.Sets/src/mage/cards/c/CoralNet.java index 2f40e03d4bb..f34a531f09a 100644 --- a/Mage.Sets/src/mage/cards/c/CoralNet.java +++ b/Mage.Sets/src/mage/cards/c/CoralNet.java @@ -44,7 +44,7 @@ public final class CoralNet extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "At the beginning of your upkeep, sacrifice this creature unless you discard a card." Ability abilityToGain = new BeginningOfUpkeepTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/c/CorruptedConscience.java b/Mage.Sets/src/mage/cards/c/CorruptedConscience.java index 3f9125d8205..824f07b8c42 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedConscience.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedConscience.java @@ -33,7 +33,7 @@ public final class CorruptedConscience extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/c/CorruptedRoots.java b/Mage.Sets/src/mage/cards/c/CorruptedRoots.java index c7924050dcf..8205707cd0c 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedRoots.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedRoots.java @@ -38,7 +38,7 @@ public final class CorruptedRoots extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land becomes tapped, its controller loses 2 life. diff --git a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java index 47ebe346272..174a117648b 100644 --- a/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java +++ b/Mage.Sets/src/mage/cards/c/CorruptedZendikon.java @@ -35,7 +35,7 @@ public final class CorruptedZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is a 3/3 black Ooze creature. It's still a land. diff --git a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java index e8db622c4f1..0c859d20550 100644 --- a/Mage.Sets/src/mage/cards/c/CowedByWisdom.java +++ b/Mage.Sets/src/mage/cards/c/CowedByWisdom.java @@ -38,7 +38,7 @@ public final class CowedByWisdom extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block unless its controller pays {1} for each card in your hand. diff --git a/Mage.Sets/src/mage/cards/c/CrabUmbra.java b/Mage.Sets/src/mage/cards/c/CrabUmbra.java index a20c166dc1d..4e4e725c36c 100644 --- a/Mage.Sets/src/mage/cards/c/CrabUmbra.java +++ b/Mage.Sets/src/mage/cards/c/CrabUmbra.java @@ -33,7 +33,7 @@ public final class CrabUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {2}{U}: Untap enchanted creature. @@ -51,4 +51,4 @@ public final class CrabUmbra extends CardImpl { public CrabUmbra copy() { return new CrabUmbra(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CracklingClub.java b/Mage.Sets/src/mage/cards/c/CracklingClub.java index 8b2ea3232e8..463f7aed2c0 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingClub.java +++ b/Mage.Sets/src/mage/cards/c/CracklingClub.java @@ -34,7 +34,7 @@ public final class CracklingClub extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/c/CracklingEmergence.java b/Mage.Sets/src/mage/cards/c/CracklingEmergence.java index b4756ff1419..434b60a9ecb 100644 --- a/Mage.Sets/src/mage/cards/c/CracklingEmergence.java +++ b/Mage.Sets/src/mage/cards/c/CracklingEmergence.java @@ -39,7 +39,7 @@ public final class CracklingEmergence extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted land is a 3/3 red Spirit creature with haste. It's still a land. this.addAbility(new SimpleStaticAbility(new BecomesCreatureAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/c/CradleOfSafety.java b/Mage.Sets/src/mage/cards/c/CradleOfSafety.java index 13f30cbff7a..d8cc9c0cdea 100644 --- a/Mage.Sets/src/mage/cards/c/CradleOfSafety.java +++ b/Mage.Sets/src/mage/cards/c/CradleOfSafety.java @@ -35,7 +35,7 @@ public final class CradleOfSafety extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Cradle of Safety enters the battlefield, enchanted creature gains hexproof until end of turn. diff --git a/Mage.Sets/src/mage/cards/c/CreatureBond.java b/Mage.Sets/src/mage/cards/c/CreatureBond.java index eb28133c1a1..bbbffff4248 100644 --- a/Mage.Sets/src/mage/cards/c/CreatureBond.java +++ b/Mage.Sets/src/mage/cards/c/CreatureBond.java @@ -34,7 +34,7 @@ public final class CreatureBond extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When enchanted creature dies, Creature Bond deals damage equal to that creature's toughness to the creature's controller. Effect effect = new DamageAttachedControllerEffect(CreatureBondValue.instance); diff --git a/Mage.Sets/src/mage/cards/c/CripplingBlight.java b/Mage.Sets/src/mage/cards/c/CripplingBlight.java index ff659c43922..afb3375946e 100644 --- a/Mage.Sets/src/mage/cards/c/CripplingBlight.java +++ b/Mage.Sets/src/mage/cards/c/CripplingBlight.java @@ -25,10 +25,10 @@ public final class CripplingBlight extends CardImpl { // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(); - this.getSpellAbility().addTarget(target); + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(target.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets -1/-1 and can't block. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/c/CrownOfAscension.java b/Mage.Sets/src/mage/cards/c/CrownOfAscension.java index 3d6eb889d24..bc28a50efa1 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfAscension.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfAscension.java @@ -30,7 +30,7 @@ public final class CrownOfAscension extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has flying. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/c/CrownOfAwe.java b/Mage.Sets/src/mage/cards/c/CrownOfAwe.java index cb8d624ecb9..156a97f421f 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfAwe.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfAwe.java @@ -31,7 +31,7 @@ public final class CrownOfAwe extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has protection from black and from red. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/c/CrownOfFlames.java b/Mage.Sets/src/mage/cards/c/CrownOfFlames.java index c4310c26879..a7641c91210 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfFlames.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfFlames.java @@ -29,7 +29,7 @@ public final class CrownOfFlames extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/c/CrownOfFury.java b/Mage.Sets/src/mage/cards/c/CrownOfFury.java index 102589db7b3..8cfeea76b71 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfFury.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfFury.java @@ -33,7 +33,7 @@ public final class CrownOfFury extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+0 and has first strike. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 0)); diff --git a/Mage.Sets/src/mage/cards/c/CrownOfSkemfar.java b/Mage.Sets/src/mage/cards/c/CrownOfSkemfar.java index 9c85341254d..4e933a337b6 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfSkemfar.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfSkemfar.java @@ -42,7 +42,7 @@ public final class CrownOfSkemfar extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 for each Elf you control and has reach. diff --git a/Mage.Sets/src/mage/cards/c/CrownOfSuspicion.java b/Mage.Sets/src/mage/cards/c/CrownOfSuspicion.java index 84e24d333c2..9b21616e094 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfSuspicion.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfSuspicion.java @@ -29,7 +29,7 @@ public final class CrownOfSuspicion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/-1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, -1))); diff --git a/Mage.Sets/src/mage/cards/c/CrownOfVigor.java b/Mage.Sets/src/mage/cards/c/CrownOfVigor.java index 139a82d3c03..ddbb81cb34d 100644 --- a/Mage.Sets/src/mage/cards/c/CrownOfVigor.java +++ b/Mage.Sets/src/mage/cards/c/CrownOfVigor.java @@ -29,7 +29,7 @@ public final class CrownOfVigor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 1))); diff --git a/Mage.Sets/src/mage/cards/c/CruelReality.java b/Mage.Sets/src/mage/cards/c/CruelReality.java index b80779dbeaf..125e25d4d52 100644 --- a/Mage.Sets/src/mage/cards/c/CruelReality.java +++ b/Mage.Sets/src/mage/cards/c/CruelReality.java @@ -36,7 +36,7 @@ public final class CruelReality extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Damage)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); //At the beginning of enchanted player's upkeep, that player sacrifices a creature or planeswalker. If the player can't, they lose 5 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(new CruelRealityEffect(), TargetController.ENCHANTED, false)); diff --git a/Mage.Sets/src/mage/cards/c/CrusherZendikon.java b/Mage.Sets/src/mage/cards/c/CrusherZendikon.java index 11e11e42008..41494530326 100644 --- a/Mage.Sets/src/mage/cards/c/CrusherZendikon.java +++ b/Mage.Sets/src/mage/cards/c/CrusherZendikon.java @@ -37,7 +37,7 @@ public final class CrusherZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is a 4/2 red Beast creature with trample. It's still a land. Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/c/Crystallization.java b/Mage.Sets/src/mage/cards/c/Crystallization.java index 64455c7837a..9bed0cecae4 100644 --- a/Mage.Sets/src/mage/cards/c/Crystallization.java +++ b/Mage.Sets/src/mage/cards/c/Crystallization.java @@ -31,7 +31,7 @@ public final class Crystallization extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't attack or block. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/c/Cunning.java b/Mage.Sets/src/mage/cards/c/Cunning.java index e9a2d7f6ed4..2d66c35423d 100644 --- a/Mage.Sets/src/mage/cards/c/Cunning.java +++ b/Mage.Sets/src/mage/cards/c/Cunning.java @@ -35,7 +35,7 @@ public final class Cunning extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. diff --git a/Mage.Sets/src/mage/cards/c/CuratorsWard.java b/Mage.Sets/src/mage/cards/c/CuratorsWard.java index 66d25cc7629..8a619798e76 100644 --- a/Mage.Sets/src/mage/cards/c/CuratorsWard.java +++ b/Mage.Sets/src/mage/cards/c/CuratorsWard.java @@ -38,7 +38,7 @@ public final class CuratorsWard extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent has hexproof. diff --git a/Mage.Sets/src/mage/cards/c/Curiosity.java b/Mage.Sets/src/mage/cards/c/Curiosity.java index 86f1fd84a9e..d5702b87c70 100644 --- a/Mage.Sets/src/mage/cards/c/Curiosity.java +++ b/Mage.Sets/src/mage/cards/c/Curiosity.java @@ -35,7 +35,7 @@ public final class Curiosity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature deals damage to an opponent, you may draw a card. @@ -83,4 +83,4 @@ class CuriosityAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever enchanted creature deals damage to an opponent, you may draw a card."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CuriousObsession.java b/Mage.Sets/src/mage/cards/c/CuriousObsession.java index 4683947c732..ef6cce7459e 100644 --- a/Mage.Sets/src/mage/cards/c/CuriousObsession.java +++ b/Mage.Sets/src/mage/cards/c/CuriousObsession.java @@ -42,7 +42,7 @@ public final class CuriousObsession extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may draw a card. diff --git a/Mage.Sets/src/mage/cards/c/CurseArtifact.java b/Mage.Sets/src/mage/cards/c/CurseArtifact.java index 4e4c693c45e..5add3042a20 100644 --- a/Mage.Sets/src/mage/cards/c/CurseArtifact.java +++ b/Mage.Sets/src/mage/cards/c/CurseArtifact.java @@ -34,7 +34,7 @@ public final class CurseArtifact extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of the upkeep of enchanted artifact's controller, Curse Artifact deals 2 damage to that player unless they sacrifice that artifact. Cost cost = new SacrificeAttachedCost(); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java b/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java index af92baba6a2..b426a945cac 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfBloodletting.java @@ -31,7 +31,7 @@ public final class CurseOfBloodletting extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Damage)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // If a source would deal damage to enchanted player, it deals double that damage to that player instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CurseOfBloodlettingEffect())); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfBounty.java b/Mage.Sets/src/mage/cards/c/CurseOfBounty.java index 6dbd6b5d05f..33046e65f1f 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfBounty.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfBounty.java @@ -36,7 +36,7 @@ public final class CurseOfBounty extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted player is attacked, untap all nonland permanents you control. // Each opponent attacking that player untaps all nonland permanents they control. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfChains.java b/Mage.Sets/src/mage/cards/c/CurseOfChains.java index e195ae14a83..0c814217970 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfChains.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfChains.java @@ -31,7 +31,7 @@ public final class CurseOfChains extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Tap)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of each upkeep, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfChaos.java b/Mage.Sets/src/mage/cards/c/CurseOfChaos.java index 505cd7ef493..d236a4158cf 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfChaos.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfChaos.java @@ -36,7 +36,7 @@ public final class CurseOfChaos extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever a player attacks enchanted player with one or more creatures, that attacking player may discard a card. If the player does, they draw a card. this.addAbility(new CurseOfChaosTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfClingingWebs.java b/Mage.Sets/src/mage/cards/c/CurseOfClingingWebs.java index 42f3e572803..d29e7bed4bc 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfClingingWebs.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfClingingWebs.java @@ -43,7 +43,7 @@ public final class CurseOfClingingWebs extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever a nontoken creature enchanted player controls dies, exile it and you create a 1/2 green Spider creature token with reach. Ability ability = new DiesCreatureTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/c/CurseOfConformity.java b/Mage.Sets/src/mage/cards/c/CurseOfConformity.java index d1bccd51baf..5ef27c7d9f6 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfConformity.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfConformity.java @@ -32,7 +32,7 @@ public final class CurseOfConformity extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Nonlegendary creatures enchanted player controls have base power and toughness 3/3 and lose all creature types. this.addAbility(new SimpleStaticAbility(new CurseOfConformityEffect())); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfDeathsHold.java b/Mage.Sets/src/mage/cards/c/CurseOfDeathsHold.java index ab293524c59..f3ce2b65611 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfDeathsHold.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfDeathsHold.java @@ -32,7 +32,7 @@ public final class CurseOfDeathsHold extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Creatures enchanted player controls get -1/-1. this.addAbility(new SimpleStaticAbility(new BoostAllEffect( diff --git a/Mage.Sets/src/mage/cards/c/CurseOfDisturbance.java b/Mage.Sets/src/mage/cards/c/CurseOfDisturbance.java index 1cd832f77cb..e016251dd32 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfDisturbance.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfDisturbance.java @@ -37,7 +37,7 @@ public final class CurseOfDisturbance extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted player is attacked, create a 2/2 black Zombie creature token. Each opponent attacking that player does the same. this.addAbility(new EnchantedPlayerAttackedTriggeredAbility(new CurseOfDisturbanceEffect())); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java b/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java index 56c68113b33..36390e2fa2f 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfEchoes.java @@ -38,7 +38,7 @@ public final class CurseOfEchoes extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Damage)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted player casts an instant or sorcery spell, each other player may copy that spell and may choose new targets for the copy they control. this.addAbility(new CurseOfEchoesCopyTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java b/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java index b942bd21c8a..807da48c214 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfExhaustion.java @@ -33,7 +33,7 @@ public final class CurseOfExhaustion extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted player can't cast more than one spell each turn. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CurseOfExhaustionEffect())); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java b/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java index 565f18e5bcb..304a4cbcc09 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfFoolsWisdom.java @@ -38,7 +38,7 @@ public final class CurseOfFoolsWisdom extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted player draws a card, they lose 2 life and you gain 2 life. @@ -97,4 +97,4 @@ class CurseOfFoolsWisdomTriggeredAbility extends TriggeredAbilityImpl { return new CurseOfFoolsWisdomTriggeredAbility(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CurseOfHospitality.java b/Mage.Sets/src/mage/cards/c/CurseOfHospitality.java index d24421778ba..94a4d8d30dd 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfHospitality.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfHospitality.java @@ -49,7 +49,7 @@ public final class CurseOfHospitality extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Creatures attacking enchanted player have trample. this.addAbility(new SimpleStaticAbility(new GainAbilityAllEffect( diff --git a/Mage.Sets/src/mage/cards/c/CurseOfInertia.java b/Mage.Sets/src/mage/cards/c/CurseOfInertia.java index e547b4414d4..166608ac488 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfInertia.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfInertia.java @@ -35,7 +35,7 @@ public final class CurseOfInertia extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever a player attacks enchanted player with one or more creatures, that attacking player may tap or untap target permanent of their choice. this.addAbility(new CurseOfInertiaTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfLeeches.java b/Mage.Sets/src/mage/cards/c/CurseOfLeeches.java index 7f57e1ac4fd..1a3feffa656 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfLeeches.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfLeeches.java @@ -36,7 +36,7 @@ public final class CurseOfLeeches extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As this permanent transforms into Curse of Leeches, attach it to a player. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java b/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java index 4a5d4dede13..d3f021f929d 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfMisfortunes.java @@ -41,7 +41,7 @@ public final class CurseOfMisfortunes extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of your upkeep, you may search your library for a Curse card that doesn't have the same name as a Curse attached to enchanted player, put it onto the battlefield attached to that player, then shuffle your library. this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.UPKEEP_STEP_PRE, "beginning of your upkeep", new CurseOfMisfortunesEffect(), true)); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java b/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java index fad2c782192..cb3e9cb25e5 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java @@ -23,10 +23,10 @@ public final class CurseOfOblivion extends CardImpl { this.subtype.add(SubType.AURA, SubType.CURSE); // Enchant player - TargetPlayer target = new TargetPlayer(); - this.getSpellAbility().addTarget(target); + TargetPlayer auraTarget = new TargetPlayer(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(target.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of enchanted player's upkeep, that player exiles two cards from their graveyard. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfObsession.java b/Mage.Sets/src/mage/cards/c/CurseOfObsession.java index 38c9340b9d1..acc326c384b 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfObsession.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfObsession.java @@ -32,7 +32,7 @@ public final class CurseOfObsession extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of enchanted player's draw step, that player draws two additional cards. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfOpulence.java b/Mage.Sets/src/mage/cards/c/CurseOfOpulence.java index 2543d90b95c..2694e0f6778 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfOpulence.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfOpulence.java @@ -37,7 +37,7 @@ public final class CurseOfOpulence extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted player is attacked, create a colorless artifact token named Gold. // It has "sacrifice this artifact: Add one mana of any color." Each opponent attacking that player does the same. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfPredation.java b/Mage.Sets/src/mage/cards/c/CurseOfPredation.java index 13f4a32cbc4..830866cbc9a 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfPredation.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfPredation.java @@ -35,7 +35,7 @@ public final class CurseOfPredation extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever a creature attacks enchanted player, put a +1/+1 counter on it. this.addAbility(new CurseOfPredationTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfShakenFaith.java b/Mage.Sets/src/mage/cards/c/CurseOfShakenFaith.java index fe92684b80c..13ea86600a0 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfShakenFaith.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfShakenFaith.java @@ -37,7 +37,7 @@ public final class CurseOfShakenFaith extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted player casts a spell other than the first spell they cast each turn or copies a spell, Curse of Shaken Faith deals 2 damage to them. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java b/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java index 504f2e5c329..eb76a1406b5 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfShallowGraves.java @@ -38,7 +38,7 @@ public final class CurseOfShallowGraves extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever a player attacks enchanted player with one or more creatures, that attacking player may create a tapped 2/2 black Zombie creature token. this.addAbility(new CurseOfShallowTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfSilence.java b/Mage.Sets/src/mage/cards/c/CurseOfSilence.java index 1abf88c002d..3ede67472e0 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfSilence.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfSilence.java @@ -40,7 +40,7 @@ public final class CurseOfSilence extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As Curse of Silence enters the battlefield, choose a card name. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfStalkedPrey.java b/Mage.Sets/src/mage/cards/c/CurseOfStalkedPrey.java index 3481dd69bb9..7f1c18072e5 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfStalkedPrey.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfStalkedPrey.java @@ -35,10 +35,10 @@ public final class CurseOfStalkedPrey extends CardImpl { // Enchant player - TargetPlayer target = new TargetPlayer(); - this.getSpellAbility().addTarget(target); + TargetPlayer auraTarget = new TargetPlayer(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(target.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever a creature deals combat damage to enchanted player, put a +1/+1 counter on that creature. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfSurveillance.java b/Mage.Sets/src/mage/cards/c/CurseOfSurveillance.java index 0d5f1620c81..dd30c9765c6 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfSurveillance.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfSurveillance.java @@ -38,7 +38,7 @@ public final class CurseOfSurveillance extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of enchanted player's upkeep, any number of target players other than that player each draw cards equal to the number of Curses attached to that player. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java b/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java index 99b5e5b31ce..64d5156db7c 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java @@ -25,10 +25,10 @@ public final class CurseOfTheBloodyTome extends CardImpl { this.subtype.add(SubType.AURA, SubType.CURSE); // Enchant player - TargetPlayer target = new TargetPlayer(); - this.getSpellAbility().addTarget(target); + TargetPlayer auraTarget = new TargetPlayer(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(target.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of enchanted player's upkeep, that player puts the top two cards of their library into their graveyard. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java b/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java index 16ee72d1fa2..72c00bf81ad 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheForsaken.java @@ -35,7 +35,7 @@ public final class CurseOfTheForsaken extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever a creature attacks enchanted player, its controller gains 1 life. this.addAbility(new CurseOfTheForsakenTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheNightlyHunt.java b/Mage.Sets/src/mage/cards/c/CurseOfTheNightlyHunt.java index d5e4e4d3a45..f1c15cd1cc2 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheNightlyHunt.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheNightlyHunt.java @@ -30,7 +30,7 @@ public final class CurseOfTheNightlyHunt extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Creatures enchanted player controls attack each turn if able. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CurseOfTheNightlyHuntEffect())); @@ -84,4 +84,4 @@ class CurseOfTheNightlyHuntEffect extends RequirementEffect { return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java index d59cbc44296..d920fae9e8e 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfThePiercedHeart.java @@ -33,10 +33,10 @@ public final class CurseOfThePiercedHeart extends CardImpl { this.subtype.add(SubType.AURA, SubType.CURSE); // Enchant player - TargetPlayer target = new TargetPlayer(); - this.getSpellAbility().addTarget(target); + TargetPlayer auraTarget = new TargetPlayer(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(target.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of enchanted player's upkeep, Curse of the Pierced Heart deals 1 damage to that player. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheRestlessDead.java b/Mage.Sets/src/mage/cards/c/CurseOfTheRestlessDead.java index f1fc1cc57ef..6d3746e0bbf 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfTheRestlessDead.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfTheRestlessDead.java @@ -39,7 +39,7 @@ public final class CurseOfTheRestlessDead extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever a land enters the battlefield under enchanted player's control, you create a 2/2 black Zombie creature token with decayed. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfThirst.java b/Mage.Sets/src/mage/cards/c/CurseOfThirst.java index 3ee3cc73375..9863448c5ae 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfThirst.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfThirst.java @@ -33,7 +33,7 @@ public final class CurseOfThirst extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of enchanted player's upkeep, Curse of Thirst deals damage to that player equal to the number of Curses attached to them. this.addAbility(new BeginningOfUpkeepTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/c/CurseOfUnbinding.java b/Mage.Sets/src/mage/cards/c/CurseOfUnbinding.java index 9e07fd63b59..e1ccefb090f 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfUnbinding.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfUnbinding.java @@ -28,7 +28,7 @@ public final class CurseOfUnbinding extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of enchanted player's upkeep, that player reveals cards from the top of their library until they reveal a creature card. Put that card onto the battlefield under your control. That player puts the rest of the revealed cards into their graveyard. diff --git a/Mage.Sets/src/mage/cards/c/CurseOfVengeance.java b/Mage.Sets/src/mage/cards/c/CurseOfVengeance.java index e6ed7c158af..3272cdc4e73 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfVengeance.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfVengeance.java @@ -38,7 +38,7 @@ public final class CurseOfVengeance extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted player casts a spell, put a spite counter on Curse of Vengeance. this.addAbility(new CurseOfVengeanceTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfVerbosity.java b/Mage.Sets/src/mage/cards/c/CurseOfVerbosity.java index f822a0ab1ec..afbde16dd2a 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfVerbosity.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfVerbosity.java @@ -36,7 +36,7 @@ public final class CurseOfVerbosity extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted player is attacked, draw a card. Each opponent attacking that player does the same. this.addAbility(new EnchantedPlayerAttackedTriggeredAbility(new CurseOfVerbosityEffect())); diff --git a/Mage.Sets/src/mage/cards/c/CurseOfVitality.java b/Mage.Sets/src/mage/cards/c/CurseOfVitality.java index 1eab5497068..7414aa4cdbc 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfVitality.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfVitality.java @@ -36,7 +36,7 @@ public final class CurseOfVitality extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted player is attacked, you gain 2 life. Each opponent attacking that player does the same. this.addAbility(new EnchantedPlayerAttackedTriggeredAbility(new CurseOfVitalityEffect())); diff --git a/Mage.Sets/src/mage/cards/c/CursedFlesh.java b/Mage.Sets/src/mage/cards/c/CursedFlesh.java index b4ebc47b032..7f8622f0d68 100644 --- a/Mage.Sets/src/mage/cards/c/CursedFlesh.java +++ b/Mage.Sets/src/mage/cards/c/CursedFlesh.java @@ -29,7 +29,7 @@ public final class CursedFlesh extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -1/-1 and has fear. diff --git a/Mage.Sets/src/mage/cards/c/CursedLand.java b/Mage.Sets/src/mage/cards/c/CursedLand.java index 63192023e3f..82114cdda08 100644 --- a/Mage.Sets/src/mage/cards/c/CursedLand.java +++ b/Mage.Sets/src/mage/cards/c/CursedLand.java @@ -31,7 +31,7 @@ public final class CursedLand extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of the upkeep of enchanted land's controller, Cursed Land deals 1 damage to that player. Effect effect = new DamageTargetEffect(1); effect.setText("{this} deals 1 damage to that player"); diff --git a/Mage.Sets/src/mage/cards/c/CustodyBattle.java b/Mage.Sets/src/mage/cards/c/CustodyBattle.java index e4fdefa78b9..99d9fc6530d 100644 --- a/Mage.Sets/src/mage/cards/c/CustodyBattle.java +++ b/Mage.Sets/src/mage/cards/c/CustodyBattle.java @@ -54,7 +54,7 @@ public final class CustodyBattle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "At the beginning of your upkeep, target opponent gains control of this creature unless you sacrifice a land." diff --git a/Mage.Sets/src/mage/cards/d/DailyRegimen.java b/Mage.Sets/src/mage/cards/d/DailyRegimen.java index ee08faf8b3a..9287dcd1005 100644 --- a/Mage.Sets/src/mage/cards/d/DailyRegimen.java +++ b/Mage.Sets/src/mage/cards/d/DailyRegimen.java @@ -33,7 +33,7 @@ public final class DailyRegimen extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {1}{W}: Put a +1/+1 counter on enchanted creature. this.addAbility(new SimpleActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java index 7fed4a82d39..9b3a793826f 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java @@ -42,7 +42,7 @@ public final class DanceOfTheDead extends CardImpl { TargetCardInGraveyard auraTarget = new TargetCardInGraveyard(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Dance of the Dead enters the battlefield, if it's on the battlefield, it loses "enchant creature // card in a graveyard" and gains "enchant creature put onto the battlefield with Dance of the Dead." diff --git a/Mage.Sets/src/mage/cards/d/DarkFavor.java b/Mage.Sets/src/mage/cards/d/DarkFavor.java index de5f36cfb34..6442332b0e7 100644 --- a/Mage.Sets/src/mage/cards/d/DarkFavor.java +++ b/Mage.Sets/src/mage/cards/d/DarkFavor.java @@ -32,7 +32,7 @@ public final class DarkFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new LoseLifeSourceControllerEffect(1), false)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/d/DarkPrivilege.java b/Mage.Sets/src/mage/cards/d/DarkPrivilege.java index 5d083284fe3..25cf81aac62 100644 --- a/Mage.Sets/src/mage/cards/d/DarkPrivilege.java +++ b/Mage.Sets/src/mage/cards/d/DarkPrivilege.java @@ -38,7 +38,7 @@ public final class DarkPrivilege extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java index 82dfd1e981a..9f869b9b701 100644 --- a/Mage.Sets/src/mage/cards/d/DarksteelMutation.java +++ b/Mage.Sets/src/mage/cards/d/DarksteelMutation.java @@ -34,7 +34,7 @@ public final class DarksteelMutation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature is an Insect artifact creature with base power and toughness 0/1 and has indestructible, and it loses all other abilities, card types, and creature types. diff --git a/Mage.Sets/src/mage/cards/d/DawnsReflection.java b/Mage.Sets/src/mage/cards/d/DawnsReflection.java index 74dc0e7f4dc..1850f72bfe6 100644 --- a/Mage.Sets/src/mage/cards/d/DawnsReflection.java +++ b/Mage.Sets/src/mage/cards/d/DawnsReflection.java @@ -35,7 +35,7 @@ public final class DawnsReflection extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors. diff --git a/Mage.Sets/src/mage/cards/d/DaybreakCoronet.java b/Mage.Sets/src/mage/cards/d/DaybreakCoronet.java index 3e7d04984ab..3ba3912cb2b 100644 --- a/Mage.Sets/src/mage/cards/d/DaybreakCoronet.java +++ b/Mage.Sets/src/mage/cards/d/DaybreakCoronet.java @@ -45,7 +45,7 @@ public final class DaybreakCoronet extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3 and has first strike, vigilance, and lifelink. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/d/DeadMansChest.java b/Mage.Sets/src/mage/cards/d/DeadMansChest.java index e906c28afa2..a571f59e67a 100644 --- a/Mage.Sets/src/mage/cards/d/DeadMansChest.java +++ b/Mage.Sets/src/mage/cards/d/DeadMansChest.java @@ -40,7 +40,7 @@ public final class DeadMansChest extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, exile cards equal to its power from the top of its owner's library. You may cast nonland cards from among them as long as they remain exiled, and you may spend mana as though it were mana of any type to cast those spells. diff --git a/Mage.Sets/src/mage/cards/d/DeadWeight.java b/Mage.Sets/src/mage/cards/d/DeadWeight.java index 90cef2209bc..2c9ef43090c 100644 --- a/Mage.Sets/src/mage/cards/d/DeadWeight.java +++ b/Mage.Sets/src/mage/cards/d/DeadWeight.java @@ -32,7 +32,7 @@ public final class DeadWeight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/d/DeathWatch.java b/Mage.Sets/src/mage/cards/d/DeathWatch.java index f3ecdf08c18..c8c72c6d3b9 100644 --- a/Mage.Sets/src/mage/cards/d/DeathWatch.java +++ b/Mage.Sets/src/mage/cards/d/DeathWatch.java @@ -33,7 +33,7 @@ public final class DeathWatch extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, its controller loses life equal to its power and you gain life equal to its toughness. diff --git a/Mage.Sets/src/mage/cards/d/DeathsApproach.java b/Mage.Sets/src/mage/cards/d/DeathsApproach.java index b2053747ca8..6754b87ffb8 100644 --- a/Mage.Sets/src/mage/cards/d/DeathsApproach.java +++ b/Mage.Sets/src/mage/cards/d/DeathsApproach.java @@ -40,7 +40,7 @@ public final class DeathsApproach extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted Creature gets -X/-X, where X is the number of creature cards in its controller's graveyard. diff --git a/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java b/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java index e8dee60098b..7febccb5786 100644 --- a/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java +++ b/Mage.Sets/src/mage/cards/d/DebilitatingInjury.java @@ -32,7 +32,7 @@ public final class DebilitatingInjury extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-2 diff --git a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java index 2f874f0f411..cfbbf2f8b7a 100644 --- a/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java +++ b/Mage.Sets/src/mage/cards/d/DebtorsPulpit.java @@ -32,7 +32,7 @@ public final class DebtorsPulpit extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Tap)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeepFreeze.java b/Mage.Sets/src/mage/cards/d/DeepFreeze.java index 4e010ff222e..c4620957a7e 100644 --- a/Mage.Sets/src/mage/cards/d/DeepFreeze.java +++ b/Mage.Sets/src/mage/cards/d/DeepFreeze.java @@ -36,7 +36,7 @@ public final class DeepFreeze extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has base power and toughness 0/4, has defender, loses all other abilities, and is a blue Wall in addition to its other colors and types. diff --git a/Mage.Sets/src/mage/cards/d/Defang.java b/Mage.Sets/src/mage/cards/d/Defang.java index cb8b3408817..980908683ed 100644 --- a/Mage.Sets/src/mage/cards/d/Defang.java +++ b/Mage.Sets/src/mage/cards/d/Defang.java @@ -31,7 +31,7 @@ public final class Defang extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Prevent all damage that would be dealt by enchanted creature. diff --git a/Mage.Sets/src/mage/cards/d/DefensiveStance.java b/Mage.Sets/src/mage/cards/d/DefensiveStance.java index 5afbabd5aac..0d61c6f79de 100644 --- a/Mage.Sets/src/mage/cards/d/DefensiveStance.java +++ b/Mage.Sets/src/mage/cards/d/DefensiveStance.java @@ -30,7 +30,7 @@ public final class DefensiveStance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, 1, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/d/Dehydration.java b/Mage.Sets/src/mage/cards/d/Dehydration.java index 1a644aee648..7f3376d4216 100644 --- a/Mage.Sets/src/mage/cards/d/Dehydration.java +++ b/Mage.Sets/src/mage/cards/d/Dehydration.java @@ -30,7 +30,7 @@ public final class Dehydration extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/d/DemonicAppetite.java b/Mage.Sets/src/mage/cards/d/DemonicAppetite.java index 28c5a77782d..a127dcf44b7 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicAppetite.java +++ b/Mage.Sets/src/mage/cards/d/DemonicAppetite.java @@ -30,7 +30,7 @@ public final class DemonicAppetite extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. diff --git a/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java b/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java index 2e79dc6ca92..db6e8ac1693 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java +++ b/Mage.Sets/src/mage/cards/d/DemonicEmbrace.java @@ -40,7 +40,7 @@ public final class DemonicEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+1, has flying, and is a Demon in addition to its other types. diff --git a/Mage.Sets/src/mage/cards/d/DemonicTorment.java b/Mage.Sets/src/mage/cards/d/DemonicTorment.java index 03dce93b32d..ea68db88be5 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicTorment.java +++ b/Mage.Sets/src/mage/cards/d/DemonicTorment.java @@ -29,7 +29,7 @@ public final class DemonicTorment extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/d/DemonicVigor.java b/Mage.Sets/src/mage/cards/d/DemonicVigor.java index 7916fde531c..53c5c27bbe1 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicVigor.java +++ b/Mage.Sets/src/mage/cards/d/DemonicVigor.java @@ -34,7 +34,7 @@ public final class DemonicVigor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/d/Demotion.java b/Mage.Sets/src/mage/cards/d/Demotion.java index 6ce957e9c3f..590fa55984d 100644 --- a/Mage.Sets/src/mage/cards/d/Demotion.java +++ b/Mage.Sets/src/mage/cards/d/Demotion.java @@ -28,7 +28,7 @@ public final class Demotion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't block, and its activated abilities can't be activated. @@ -44,4 +44,4 @@ public final class Demotion extends CardImpl { public Demotion copy() { return new Demotion(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DesertsHold.java b/Mage.Sets/src/mage/cards/d/DesertsHold.java index 6a2a3883f1c..88d59ceb21f 100644 --- a/Mage.Sets/src/mage/cards/d/DesertsHold.java +++ b/Mage.Sets/src/mage/cards/d/DesertsHold.java @@ -32,7 +32,7 @@ public final class DesertsHold extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Desert's Hold enters the battlefield, if you control a Desert or there is a Desert card in your graveyard, you gain 3 life. this.addAbility(new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/d/Despondency.java b/Mage.Sets/src/mage/cards/d/Despondency.java index 5c3e61307df..749ec8fa54a 100644 --- a/Mage.Sets/src/mage/cards/d/Despondency.java +++ b/Mage.Sets/src/mage/cards/d/Despondency.java @@ -32,7 +32,7 @@ public final class Despondency extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-0. diff --git a/Mage.Sets/src/mage/cards/d/DestructiveUrge.java b/Mage.Sets/src/mage/cards/d/DestructiveUrge.java index 856e35917ad..f675344598e 100644 --- a/Mage.Sets/src/mage/cards/d/DestructiveUrge.java +++ b/Mage.Sets/src/mage/cards/d/DestructiveUrge.java @@ -31,7 +31,7 @@ public final class DestructiveUrge extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature deals combat damage to a player, that player sacrifices a land. diff --git a/Mage.Sets/src/mage/cards/d/DetainmentSpell.java b/Mage.Sets/src/mage/cards/d/DetainmentSpell.java index 21845e373f6..8b14769ec6d 100644 --- a/Mage.Sets/src/mage/cards/d/DetainmentSpell.java +++ b/Mage.Sets/src/mage/cards/d/DetainmentSpell.java @@ -33,7 +33,7 @@ public final class DetainmentSpell extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature's activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/d/DetentionVortex.java b/Mage.Sets/src/mage/cards/d/DetentionVortex.java index aca5121045a..e522a8a65ae 100644 --- a/Mage.Sets/src/mage/cards/d/DetentionVortex.java +++ b/Mage.Sets/src/mage/cards/d/DetentionVortex.java @@ -33,7 +33,7 @@ public final class DetentionVortex extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_NON_LAND); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted permanent can't attack or block, and its activated abilities can't be activated. this.addAbility(new SimpleStaticAbility(new CantBlockAttackActivateAttachedEffect("permanent"))); diff --git a/Mage.Sets/src/mage/cards/d/DeviantGlee.java b/Mage.Sets/src/mage/cards/d/DeviantGlee.java index 8613c42bb1b..60ad4606edf 100644 --- a/Mage.Sets/src/mage/cards/d/DeviantGlee.java +++ b/Mage.Sets/src/mage/cards/d/DeviantGlee.java @@ -36,7 +36,7 @@ public final class DeviantGlee extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1 and has "{R}: This creature gains trample until end of turn." diff --git a/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java b/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java index 6f65cb4a1dd..48767027a5c 100644 --- a/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java +++ b/Mage.Sets/src/mage/cards/d/DiplomaticImmunity.java @@ -32,7 +32,7 @@ public final class DiplomaticImmunity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Shroud diff --git a/Mage.Sets/src/mage/cards/d/Disappear.java b/Mage.Sets/src/mage/cards/d/Disappear.java index fbfca8f0aa8..b547138ec34 100644 --- a/Mage.Sets/src/mage/cards/d/Disappear.java +++ b/Mage.Sets/src/mage/cards/d/Disappear.java @@ -34,7 +34,7 @@ public final class Disappear extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {U}: Return enchanted creature and Disappear to their owners' hands. diff --git a/Mage.Sets/src/mage/cards/d/DisruptionAura.java b/Mage.Sets/src/mage/cards/d/DisruptionAura.java index 823071ab118..540237bd285 100644 --- a/Mage.Sets/src/mage/cards/d/DisruptionAura.java +++ b/Mage.Sets/src/mage/cards/d/DisruptionAura.java @@ -35,7 +35,7 @@ public final class DisruptionAura extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted artifact has "At the beginning of your upkeep, sacrifice this artifact unless you pay its mana cost." ability = new BeginningOfUpkeepTriggeredAbility(new DisruptionAuraEffect(), TargetController.YOU, false); @@ -90,4 +90,4 @@ class DisruptionAuraEffect extends OneShotEffect { return new DisruptionAuraEffect(this); } - } \ No newline at end of file + } diff --git a/Mage.Sets/src/mage/cards/d/DivineFavor.java b/Mage.Sets/src/mage/cards/d/DivineFavor.java index a4e9d447ece..7f25ae6ab7e 100644 --- a/Mage.Sets/src/mage/cards/d/DivineFavor.java +++ b/Mage.Sets/src/mage/cards/d/DivineFavor.java @@ -32,7 +32,7 @@ public final class DivineFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3), false)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/d/DivineTransformation.java b/Mage.Sets/src/mage/cards/d/DivineTransformation.java index 5cd2a3ef3fb..f384e1a8068 100644 --- a/Mage.Sets/src/mage/cards/d/DivineTransformation.java +++ b/Mage.Sets/src/mage/cards/d/DivineTransformation.java @@ -33,7 +33,7 @@ public final class DivineTransformation extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); // Enchanted creature gets +3/+3. - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/d/DizzyingGaze.java b/Mage.Sets/src/mage/cards/d/DizzyingGaze.java index 34d46e4a600..dc6a62204bc 100644 --- a/Mage.Sets/src/mage/cards/d/DizzyingGaze.java +++ b/Mage.Sets/src/mage/cards/d/DizzyingGaze.java @@ -45,7 +45,7 @@ public final class DizzyingGaze extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {R}: Enchanted creature deals 1 damage to target creature with flying. diff --git a/Mage.Sets/src/mage/cards/d/Domestication.java b/Mage.Sets/src/mage/cards/d/Domestication.java index ade98301a9f..86d300be017 100644 --- a/Mage.Sets/src/mage/cards/d/Domestication.java +++ b/Mage.Sets/src/mage/cards/d/Domestication.java @@ -38,7 +38,7 @@ public final class Domestication extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/d/Domineer.java b/Mage.Sets/src/mage/cards/d/Domineer.java index bea82fe7978..ff847f390f4 100644 --- a/Mage.Sets/src/mage/cards/d/Domineer.java +++ b/Mage.Sets/src/mage/cards/d/Domineer.java @@ -37,7 +37,7 @@ public final class Domineer extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted artifact creature. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("artifact creature"))); diff --git a/Mage.Sets/src/mage/cards/d/DorotheasRetribution.java b/Mage.Sets/src/mage/cards/d/DorotheasRetribution.java index 8a837315163..459825e644d 100644 --- a/Mage.Sets/src/mage/cards/d/DorotheasRetribution.java +++ b/Mage.Sets/src/mage/cards/d/DorotheasRetribution.java @@ -43,7 +43,7 @@ public final class DorotheasRetribution extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever this creature attacks, create a 4/4 white Spirit creature token with flying that's tapped and attacking. Sacrifice that token at end of combat." diff --git a/Mage.Sets/src/mage/cards/d/DragonBreath.java b/Mage.Sets/src/mage/cards/d/DragonBreath.java index e068bc911b9..d3033ffad06 100644 --- a/Mage.Sets/src/mage/cards/d/DragonBreath.java +++ b/Mage.Sets/src/mage/cards/d/DragonBreath.java @@ -44,7 +44,7 @@ public final class DragonBreath extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has haste. diff --git a/Mage.Sets/src/mage/cards/d/DragonFangs.java b/Mage.Sets/src/mage/cards/d/DragonFangs.java index 79f652d8ca3..51c6f292c5c 100644 --- a/Mage.Sets/src/mage/cards/d/DragonFangs.java +++ b/Mage.Sets/src/mage/cards/d/DragonFangs.java @@ -42,7 +42,7 @@ public final class DragonFangs extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has trample. diff --git a/Mage.Sets/src/mage/cards/d/DragonGrip.java b/Mage.Sets/src/mage/cards/d/DragonGrip.java index 8975d078262..5c77069f020 100644 --- a/Mage.Sets/src/mage/cards/d/DragonGrip.java +++ b/Mage.Sets/src/mage/cards/d/DragonGrip.java @@ -41,7 +41,7 @@ public final class DragonGrip extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0 and has first strike. diff --git a/Mage.Sets/src/mage/cards/d/DragonMantle.java b/Mage.Sets/src/mage/cards/d/DragonMantle.java index 132e6770cf3..79f5c81c72a 100644 --- a/Mage.Sets/src/mage/cards/d/DragonMantle.java +++ b/Mage.Sets/src/mage/cards/d/DragonMantle.java @@ -33,7 +33,7 @@ public final class DragonMantle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Dragon Mantle enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); diff --git a/Mage.Sets/src/mage/cards/d/DragonScales.java b/Mage.Sets/src/mage/cards/d/DragonScales.java index 0128adc3df2..848c26f170e 100644 --- a/Mage.Sets/src/mage/cards/d/DragonScales.java +++ b/Mage.Sets/src/mage/cards/d/DragonScales.java @@ -42,7 +42,7 @@ public final class DragonScales extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2 and has vigilance. @@ -93,4 +93,4 @@ class DragonScalesEffect extends OneShotEffect { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DragonShadow.java b/Mage.Sets/src/mage/cards/d/DragonShadow.java index 21ea31de54e..97cc9ac34ad 100644 --- a/Mage.Sets/src/mage/cards/d/DragonShadow.java +++ b/Mage.Sets/src/mage/cards/d/DragonShadow.java @@ -42,7 +42,7 @@ public final class DragonShadow extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0 and has fear. diff --git a/Mage.Sets/src/mage/cards/d/DragonWings.java b/Mage.Sets/src/mage/cards/d/DragonWings.java index d9b0aeebce0..9c5e9bde2d4 100644 --- a/Mage.Sets/src/mage/cards/d/DragonWings.java +++ b/Mage.Sets/src/mage/cards/d/DragonWings.java @@ -43,7 +43,7 @@ public final class DragonWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. diff --git a/Mage.Sets/src/mage/cards/d/DrakeUmbra.java b/Mage.Sets/src/mage/cards/d/DrakeUmbra.java index 4b55be6cdd3..4feecc062a4 100644 --- a/Mage.Sets/src/mage/cards/d/DrakeUmbra.java +++ b/Mage.Sets/src/mage/cards/d/DrakeUmbra.java @@ -30,7 +30,7 @@ public final class DrakeUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3 and has flying. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/d/DreadfulApathy.java b/Mage.Sets/src/mage/cards/d/DreadfulApathy.java index 55529c3acfa..98d26844167 100644 --- a/Mage.Sets/src/mage/cards/d/DreadfulApathy.java +++ b/Mage.Sets/src/mage/cards/d/DreadfulApathy.java @@ -33,7 +33,7 @@ public final class DreadfulApathy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. diff --git a/Mage.Sets/src/mage/cards/d/DreamCoat.java b/Mage.Sets/src/mage/cards/d/DreamCoat.java index caa7f5a7e7f..5befb8ba816 100644 --- a/Mage.Sets/src/mage/cards/d/DreamCoat.java +++ b/Mage.Sets/src/mage/cards/d/DreamCoat.java @@ -40,7 +40,7 @@ public final class DreamCoat extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {0}: Enchanted creature becomes the color or colors of your choice. Activate this ability only once each turn. diff --git a/Mage.Sets/src/mage/cards/d/DreamLeash.java b/Mage.Sets/src/mage/cards/d/DreamLeash.java index 5b600319397..6420fe1e7d6 100644 --- a/Mage.Sets/src/mage/cards/d/DreamLeash.java +++ b/Mage.Sets/src/mage/cards/d/DreamLeash.java @@ -32,7 +32,7 @@ public final class DreamLeash extends CardImpl { auraTarget.withChooseHint("must be tapped"); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You can't choose an untapped permanent as Dream Leash's target as you cast Dream Leash. @@ -51,4 +51,4 @@ public final class DreamLeash extends CardImpl { public DreamLeash copy() { return new DreamLeash(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/d/DrogskolArmaments.java b/Mage.Sets/src/mage/cards/d/DrogskolArmaments.java index 6cc3230caf2..e071b99cdb0 100644 --- a/Mage.Sets/src/mage/cards/d/DrogskolArmaments.java +++ b/Mage.Sets/src/mage/cards/d/DrogskolArmaments.java @@ -33,7 +33,7 @@ public final class DrogskolArmaments extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/d/DruidsCall.java b/Mage.Sets/src/mage/cards/d/DruidsCall.java index 77072372e04..939fbb0b6b8 100644 --- a/Mage.Sets/src/mage/cards/d/DruidsCall.java +++ b/Mage.Sets/src/mage/cards/d/DruidsCall.java @@ -32,7 +32,7 @@ public final class DruidsCall extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature is dealt damage, its controller creates that many 1/1 green Squirrel creature tokens. Effect effect = new CreateTokenTargetEffect(new SquirrelToken(), SavedDamageValue.MANY); diff --git a/Mage.Sets/src/mage/cards/d/DryadsFavor.java b/Mage.Sets/src/mage/cards/d/DryadsFavor.java index e03723c5e44..fd69235b629 100644 --- a/Mage.Sets/src/mage/cards/d/DryadsFavor.java +++ b/Mage.Sets/src/mage/cards/d/DryadsFavor.java @@ -33,7 +33,7 @@ public final class DryadsFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has forestwalk. diff --git a/Mage.Sets/src/mage/cards/d/DualCasting.java b/Mage.Sets/src/mage/cards/d/DualCasting.java index b2b6b238179..4b42a45c091 100644 --- a/Mage.Sets/src/mage/cards/d/DualCasting.java +++ b/Mage.Sets/src/mage/cards/d/DualCasting.java @@ -43,7 +43,7 @@ public final class DualCasting extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{R}, {tap}: Copy target instant or sorcery spell you control. You may choose new targets for the copy." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), new ColoredManaCost(ColoredManaSymbol.R)); diff --git a/Mage.Sets/src/mage/cards/d/Dub.java b/Mage.Sets/src/mage/cards/d/Dub.java index a1dcf3b221c..e2d96e88159 100644 --- a/Mage.Sets/src/mage/cards/d/Dub.java +++ b/Mage.Sets/src/mage/cards/d/Dub.java @@ -36,7 +36,7 @@ public final class Dub extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has first strike, and is a Knight in addition to its other types. diff --git a/Mage.Sets/src/mage/cards/d/DustCorona.java b/Mage.Sets/src/mage/cards/d/DustCorona.java index 2a499c22419..967c23c7092 100644 --- a/Mage.Sets/src/mage/cards/d/DustCorona.java +++ b/Mage.Sets/src/mage/cards/d/DustCorona.java @@ -37,7 +37,7 @@ public final class DustCorona extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0 and can't be blocked by creatures with flying. diff --git a/Mage.Sets/src/mage/cards/d/Dwindle.java b/Mage.Sets/src/mage/cards/d/Dwindle.java index bb48cb4a66f..33e30319811 100644 --- a/Mage.Sets/src/mage/cards/d/Dwindle.java +++ b/Mage.Sets/src/mage/cards/d/Dwindle.java @@ -33,7 +33,7 @@ public final class Dwindle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -6/-0. diff --git a/Mage.Sets/src/mage/cards/d/DyingWail.java b/Mage.Sets/src/mage/cards/d/DyingWail.java index 3230d868919..95baadf2fa3 100644 --- a/Mage.Sets/src/mage/cards/d/DyingWail.java +++ b/Mage.Sets/src/mage/cards/d/DyingWail.java @@ -30,7 +30,7 @@ public final class DyingWail extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, target player discards two cards. ability = new DiesAttachedTriggeredAbility(new DiscardTargetEffect(2), "enchanted creature"); diff --git a/Mage.Sets/src/mage/cards/d/DyingWish.java b/Mage.Sets/src/mage/cards/d/DyingWish.java index 6b3e2888a68..a889f3b529f 100644 --- a/Mage.Sets/src/mage/cards/d/DyingWish.java +++ b/Mage.Sets/src/mage/cards/d/DyingWish.java @@ -37,7 +37,7 @@ public final class DyingWish extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, target player loses X life and you gain X life, where X is its power. diff --git a/Mage.Sets/src/mage/cards/e/Earthbind.java b/Mage.Sets/src/mage/cards/e/Earthbind.java index a813a37ca4e..a6ff35b0aae 100644 --- a/Mage.Sets/src/mage/cards/e/Earthbind.java +++ b/Mage.Sets/src/mage/cards/e/Earthbind.java @@ -35,7 +35,7 @@ public final class Earthbind extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Earthbind enters the battlefield, if enchanted creature has flying, Earthbind deals 2 damage to that creature and Earthbind gains "Enchanted creature loses flying." diff --git a/Mage.Sets/src/mage/cards/e/Earthlore.java b/Mage.Sets/src/mage/cards/e/Earthlore.java index 9b348f87e07..38750d5e969 100644 --- a/Mage.Sets/src/mage/cards/e/Earthlore.java +++ b/Mage.Sets/src/mage/cards/e/Earthlore.java @@ -51,7 +51,7 @@ public final class Earthlore extends CardImpl { TargetPermanent auraTarget = new TargetControlledPermanent(filterLand); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Tap enchanted land: Target blocking creature gets +1/+2 until end of turn. Activate this ability only if enchanted land is untapped. diff --git a/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java b/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java index 3e470ce9bc7..013be003915 100644 --- a/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java +++ b/Mage.Sets/src/mage/cards/e/EdgeOfTheDivinity.java @@ -34,7 +34,7 @@ public final class EdgeOfTheDivinity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is white, it gets +1/+2. SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 2), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+2")); diff --git a/Mage.Sets/src/mage/cards/e/EelUmbra.java b/Mage.Sets/src/mage/cards/e/EelUmbra.java index f328b8fce12..07544525f6e 100644 --- a/Mage.Sets/src/mage/cards/e/EelUmbra.java +++ b/Mage.Sets/src/mage/cards/e/EelUmbra.java @@ -36,7 +36,7 @@ public final class EelUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/e/ElandUmbra.java b/Mage.Sets/src/mage/cards/e/ElandUmbra.java index b77016130c3..dfa0cc311d0 100644 --- a/Mage.Sets/src/mage/cards/e/ElandUmbra.java +++ b/Mage.Sets/src/mage/cards/e/ElandUmbra.java @@ -32,7 +32,7 @@ public final class ElandUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+4. diff --git a/Mage.Sets/src/mage/cards/e/ElderMastery.java b/Mage.Sets/src/mage/cards/e/ElderMastery.java index ee1065eb808..9889c5191dd 100644 --- a/Mage.Sets/src/mage/cards/e/ElderMastery.java +++ b/Mage.Sets/src/mage/cards/e/ElderMastery.java @@ -30,7 +30,7 @@ public final class ElderMastery extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3 and has flying. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/e/EldraziConscription.java b/Mage.Sets/src/mage/cards/e/EldraziConscription.java index 3ff07200723..bae34c54172 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziConscription.java +++ b/Mage.Sets/src/mage/cards/e/EldraziConscription.java @@ -33,7 +33,7 @@ public final class EldraziConscription extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +10/+10 and has trample and annihilator 2 diff --git a/Mage.Sets/src/mage/cards/e/ElementalMastery.java b/Mage.Sets/src/mage/cards/e/ElementalMastery.java index 1e398e15ca2..0587e41d0e4 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalMastery.java +++ b/Mage.Sets/src/mage/cards/e/ElementalMastery.java @@ -38,7 +38,7 @@ public final class ElementalMastery extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: create X 1/1 red Elemental creature tokens with haste, where X is this creature's power. Exile them at the beginning of the next end step." diff --git a/Mage.Sets/src/mage/cards/e/ElementalResonance.java b/Mage.Sets/src/mage/cards/e/ElementalResonance.java index 10496fa4047..01f8852ce62 100644 --- a/Mage.Sets/src/mage/cards/e/ElementalResonance.java +++ b/Mage.Sets/src/mage/cards/e/ElementalResonance.java @@ -39,7 +39,7 @@ public final class ElementalResonance extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutManaInPool)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your precombat main phase, add mana equal to enchanted permanent's mana cost. diff --git a/Mage.Sets/src/mage/cards/e/ElephantGuide.java b/Mage.Sets/src/mage/cards/e/ElephantGuide.java index d1a3ea7e161..065aa17cf50 100644 --- a/Mage.Sets/src/mage/cards/e/ElephantGuide.java +++ b/Mage.Sets/src/mage/cards/e/ElephantGuide.java @@ -35,7 +35,7 @@ public final class ElephantGuide extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. diff --git a/Mage.Sets/src/mage/cards/e/ElvishGuidance.java b/Mage.Sets/src/mage/cards/e/ElvishGuidance.java index 7d0cee4f364..cd928ba7051 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishGuidance.java +++ b/Mage.Sets/src/mage/cards/e/ElvishGuidance.java @@ -35,7 +35,7 @@ public final class ElvishGuidance extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutManaInPool)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land is tapped for mana, its controller adds {G} for each Elf on the battlefield. diff --git a/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java b/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java index 473f33f27d7..e579e4134fc 100644 --- a/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java +++ b/Mage.Sets/src/mage/cards/e/EmblemOfTheWarmind.java @@ -33,7 +33,7 @@ public final class EmblemOfTheWarmind extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control have haste. diff --git a/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java b/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java index 9c759a4cdf4..d6e425b0d64 100644 --- a/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java +++ b/Mage.Sets/src/mage/cards/e/EmpyrialArmor.java @@ -34,7 +34,7 @@ public final class EmpyrialArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 for each card in your hand. diff --git a/Mage.Sets/src/mage/cards/e/EncaseInIce.java b/Mage.Sets/src/mage/cards/e/EncaseInIce.java index 82c4c864bd3..5c0d1dba1d2 100644 --- a/Mage.Sets/src/mage/cards/e/EncaseInIce.java +++ b/Mage.Sets/src/mage/cards/e/EncaseInIce.java @@ -47,7 +47,7 @@ public final class EncaseInIce extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Encase in Ice enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/e/Encrust.java b/Mage.Sets/src/mage/cards/e/Encrust.java index 18e02ff1250..a92e64524bf 100644 --- a/Mage.Sets/src/mage/cards/e/Encrust.java +++ b/Mage.Sets/src/mage/cards/e/Encrust.java @@ -42,7 +42,7 @@ public final class Encrust extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent doesn't untap during its controller's untap step and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/e/EndlessEvil.java b/Mage.Sets/src/mage/cards/e/EndlessEvil.java index 2df77285851..f1b81a1a871 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessEvil.java +++ b/Mage.Sets/src/mage/cards/e/EndlessEvil.java @@ -38,7 +38,7 @@ public final class EndlessEvil extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, create a token that’s a copy of enchanted creature, except the token is 1/1. diff --git a/Mage.Sets/src/mage/cards/e/EndlessScream.java b/Mage.Sets/src/mage/cards/e/EndlessScream.java index 57e567ac94c..7979a9eee57 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessScream.java +++ b/Mage.Sets/src/mage/cards/e/EndlessScream.java @@ -36,7 +36,7 @@ public final class EndlessScream extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Endless Scream enters the battlefield with X scream counters on it. this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.SCREAM.createInstance()))); diff --git a/Mage.Sets/src/mage/cards/e/Enfeeblement.java b/Mage.Sets/src/mage/cards/e/Enfeeblement.java index 3e14d3f07b7..77847a935fa 100644 --- a/Mage.Sets/src/mage/cards/e/Enfeeblement.java +++ b/Mage.Sets/src/mage/cards/e/Enfeeblement.java @@ -29,7 +29,7 @@ public final class Enfeeblement extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -2, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/e/Enslave.java b/Mage.Sets/src/mage/cards/e/Enslave.java index 00cb39918b8..63cd5ce8ae9 100644 --- a/Mage.Sets/src/mage/cards/e/Enslave.java +++ b/Mage.Sets/src/mage/cards/e/Enslave.java @@ -31,7 +31,7 @@ public final class Enslave extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java index d2306ba02f9..df75c675e74 100644 --- a/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java +++ b/Mage.Sets/src/mage/cards/e/EnsoulArtifact.java @@ -33,7 +33,7 @@ public final class EnsoulArtifact extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types. @@ -51,4 +51,4 @@ public final class EnsoulArtifact extends CardImpl { public EnsoulArtifact copy() { return new EnsoulArtifact(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/e/Entangler.java b/Mage.Sets/src/mage/cards/e/Entangler.java index 87cc381ed1f..516cdbfba83 100644 --- a/Mage.Sets/src/mage/cards/e/Entangler.java +++ b/Mage.Sets/src/mage/cards/e/Entangler.java @@ -35,7 +35,7 @@ public final class Entangler extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can block any number of creatures. diff --git a/Mage.Sets/src/mage/cards/e/EntanglingVines.java b/Mage.Sets/src/mage/cards/e/EntanglingVines.java index 2253c0d4d0c..63a1c0449b3 100644 --- a/Mage.Sets/src/mage/cards/e/EntanglingVines.java +++ b/Mage.Sets/src/mage/cards/e/EntanglingVines.java @@ -38,7 +38,7 @@ public final class EntanglingVines extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/e/EnthrallingHold.java b/Mage.Sets/src/mage/cards/e/EnthrallingHold.java index 3caa4a63764..f9e51e18577 100644 --- a/Mage.Sets/src/mage/cards/e/EnthrallingHold.java +++ b/Mage.Sets/src/mage/cards/e/EnthrallingHold.java @@ -33,7 +33,7 @@ public final class EnthrallingHold extends CardImpl { auraTarget.withChooseHint("must be tapped"); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You can't choose an untapped creature as this spell's target as you cast it. @@ -52,4 +52,4 @@ public final class EnthrallingHold extends CardImpl { public EnthrallingHold copy() { return new EnthrallingHold(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java b/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java index 633da39cbea..0bd1308dcbd 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java +++ b/Mage.Sets/src/mage/cards/e/EpharasEnlightenment.java @@ -39,7 +39,7 @@ public final class EpharasEnlightenment extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Ephara's Enlightenment enters the battlefield, put a +1/+1 counter on enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersAttachedEffect(CounterType.P1P1.createInstance(), "enchanted creature"), false)); diff --git a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java index 9578d46b640..e002319132f 100644 --- a/Mage.Sets/src/mage/cards/e/EpharasRadiance.java +++ b/Mage.Sets/src/mage/cards/e/EpharasRadiance.java @@ -32,7 +32,7 @@ public final class EpharasRadiance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{1}{W}, {T}: You gain 3 life." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new ManaCostsImpl<>("{1}{W}")); diff --git a/Mage.Sets/src/mage/cards/e/EpicProportions.java b/Mage.Sets/src/mage/cards/e/EpicProportions.java index 737a88ffd6c..61e75609e7c 100644 --- a/Mage.Sets/src/mage/cards/e/EpicProportions.java +++ b/Mage.Sets/src/mage/cards/e/EpicProportions.java @@ -29,7 +29,7 @@ public final class EpicProportions extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( 5, 5, Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java index 2cf6a33efb0..05ac33b21c3 100644 --- a/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java +++ b/Mage.Sets/src/mage/cards/e/EpiphanyStorm.java @@ -37,7 +37,7 @@ public final class EpiphanyStorm extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{R}, {T}, Discard a card: Draw a card." diff --git a/Mage.Sets/src/mage/cards/e/EquestrianSkill.java b/Mage.Sets/src/mage/cards/e/EquestrianSkill.java index d323db7181c..0273b7e1661 100644 --- a/Mage.Sets/src/mage/cards/e/EquestrianSkill.java +++ b/Mage.Sets/src/mage/cards/e/EquestrianSkill.java @@ -31,7 +31,7 @@ public final class EquestrianSkill extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/e/Erosion.java b/Mage.Sets/src/mage/cards/e/Erosion.java index 1ef4413f597..61d8aaea840 100644 --- a/Mage.Sets/src/mage/cards/e/Erosion.java +++ b/Mage.Sets/src/mage/cards/e/Erosion.java @@ -35,7 +35,7 @@ public final class Erosion extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of the upkeep of enchanted land's controller, destroy that land unless that player pays {1} or 1 life. Effect effect = new DoUnlessTargetPlayerOrTargetsControllerPaysEffect(new DestroyAttachedToEffect("enchanted land"), new OrCost("{1} or 1 life", new ManaCostsImpl<>("{1}"), new PayLifeCost(1))); diff --git a/Mage.Sets/src/mage/cards/e/ErrantMinion.java b/Mage.Sets/src/mage/cards/e/ErrantMinion.java index f6d80ffc9ea..fbddd8d334e 100644 --- a/Mage.Sets/src/mage/cards/e/ErrantMinion.java +++ b/Mage.Sets/src/mage/cards/e/ErrantMinion.java @@ -34,7 +34,7 @@ public final class ErrantMinion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of the upkeep of enchanted creature's controller, that player may pay any amount of mana. Errant Minion deals 2 damage to that player. Prevent X of that damage, where X is the amount of mana that player paid this way. diff --git a/Mage.Sets/src/mage/cards/e/Errantry.java b/Mage.Sets/src/mage/cards/e/Errantry.java index 931f10ab456..0494aabe560 100644 --- a/Mage.Sets/src/mage/cards/e/Errantry.java +++ b/Mage.Sets/src/mage/cards/e/Errantry.java @@ -34,7 +34,7 @@ public final class Errantry extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+0 and can only attack alone. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/e/EscapeVelocity.java b/Mage.Sets/src/mage/cards/e/EscapeVelocity.java index b563a99ea86..cce59638f47 100644 --- a/Mage.Sets/src/mage/cards/e/EscapeVelocity.java +++ b/Mage.Sets/src/mage/cards/e/EscapeVelocity.java @@ -30,7 +30,7 @@ public final class EscapeVelocity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0 and has haste. diff --git a/Mage.Sets/src/mage/cards/e/EssenceFlare.java b/Mage.Sets/src/mage/cards/e/EssenceFlare.java index 7337737469c..813d438089b 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceFlare.java +++ b/Mage.Sets/src/mage/cards/e/EssenceFlare.java @@ -34,7 +34,7 @@ public final class EssenceFlare extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0))); diff --git a/Mage.Sets/src/mage/cards/e/EssenceLeak.java b/Mage.Sets/src/mage/cards/e/EssenceLeak.java index 2bb218977ed..4673217ec68 100644 --- a/Mage.Sets/src/mage/cards/e/EssenceLeak.java +++ b/Mage.Sets/src/mage/cards/e/EssenceLeak.java @@ -39,7 +39,7 @@ public final class EssenceLeak extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted permanent is red or green, it has "At the beginning of your upkeep, sacrifice this permanent unless you pay its mana cost." @@ -97,4 +97,4 @@ class EssenceLeakEffect extends OneShotEffect { return new EssenceLeakEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/e/EternalThirst.java b/Mage.Sets/src/mage/cards/e/EternalThirst.java index 48dea680727..c07dac54a8f 100644 --- a/Mage.Sets/src/mage/cards/e/EternalThirst.java +++ b/Mage.Sets/src/mage/cards/e/EternalThirst.java @@ -33,7 +33,7 @@ public final class EternalThirst extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has lifelink diff --git a/Mage.Sets/src/mage/cards/e/EternalWarrior.java b/Mage.Sets/src/mage/cards/e/EternalWarrior.java index 29f5e1428fe..f2c14cea107 100644 --- a/Mage.Sets/src/mage/cards/e/EternalWarrior.java +++ b/Mage.Sets/src/mage/cards/e/EternalWarrior.java @@ -32,7 +32,7 @@ public final class EternalWarrior extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchant creature has vigilance diff --git a/Mage.Sets/src/mage/cards/e/EternitySnare.java b/Mage.Sets/src/mage/cards/e/EternitySnare.java index a51453a6d90..11a596adc8e 100644 --- a/Mage.Sets/src/mage/cards/e/EternitySnare.java +++ b/Mage.Sets/src/mage/cards/e/EternitySnare.java @@ -33,7 +33,7 @@ public final class EternitySnare extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Eternity Snare enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/e/EtherealArmor.java b/Mage.Sets/src/mage/cards/e/EtherealArmor.java index c72bf2cac9f..b641734c6ce 100644 --- a/Mage.Sets/src/mage/cards/e/EtherealArmor.java +++ b/Mage.Sets/src/mage/cards/e/EtherealArmor.java @@ -37,7 +37,7 @@ public final class EtherealArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 for each enchantment you control and has first strike. diff --git a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java index c35b8c2222f..890c1fc129d 100644 --- a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java +++ b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java @@ -33,7 +33,7 @@ public final class EvanescentIntellect extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{1}{U}, {T}: Target player puts the top three cards of their library into their graveyard." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MillCardsTargetEffect(3), new ManaCostsImpl<>("{1}{U}")); diff --git a/Mage.Sets/src/mage/cards/e/EvilPresence.java b/Mage.Sets/src/mage/cards/e/EvilPresence.java index 95b034a58e7..8f8caa54ad4 100644 --- a/Mage.Sets/src/mage/cards/e/EvilPresence.java +++ b/Mage.Sets/src/mage/cards/e/EvilPresence.java @@ -30,7 +30,7 @@ public final class EvilPresence extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted land is a Swamp. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.SWAMP))); diff --git a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java index e54973a2dd1..7bdfff85721 100644 --- a/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java +++ b/Mage.Sets/src/mage/cards/e/ExoskeletalArmor.java @@ -33,7 +33,7 @@ public final class ExoskeletalArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +X/+X, where X is the number of creature cards in all graveyards. CardsInAllGraveyardsCount count = new CardsInAllGraveyardsCount(StaticFilters.FILTER_CARD_CREATURES); diff --git a/Mage.Sets/src/mage/cards/e/ExoticCurse.java b/Mage.Sets/src/mage/cards/e/ExoticCurse.java index b3c478e06bb..92fab7e1af7 100644 --- a/Mage.Sets/src/mage/cards/e/ExoticCurse.java +++ b/Mage.Sets/src/mage/cards/e/ExoticCurse.java @@ -30,7 +30,7 @@ public final class ExoticCurse extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Domain - Enchanted creature gets -1/-1 for each basic land type among lands you control. DynamicValue unboost = new SignInversionDynamicValue(DomainValue.REGULAR); diff --git a/Mage.Sets/src/mage/cards/e/ExtraArms.java b/Mage.Sets/src/mage/cards/e/ExtraArms.java index c2bab4ed70e..76e0368a503 100644 --- a/Mage.Sets/src/mage/cards/e/ExtraArms.java +++ b/Mage.Sets/src/mage/cards/e/ExtraArms.java @@ -32,7 +32,7 @@ public final class ExtraArms extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, it deals 2 damage to any target. ability = new AttacksAttachedTriggeredAbility(new DamageTargetEffect(2, "it"), AttachmentType.AURA, false); diff --git a/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java b/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java index 1ad93db0840..4dbdf91f625 100644 --- a/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java +++ b/Mage.Sets/src/mage/cards/f/FaceOfDivinity.java @@ -34,7 +34,7 @@ public final class FaceOfDivinity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/f/FaithUnbroken.java b/Mage.Sets/src/mage/cards/f/FaithUnbroken.java index 589510cfdd8..4ba049a2ec6 100644 --- a/Mage.Sets/src/mage/cards/f/FaithUnbroken.java +++ b/Mage.Sets/src/mage/cards/f/FaithUnbroken.java @@ -32,7 +32,7 @@ public final class FaithUnbroken extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Faith Unbroken enters the battlefield, exile target creature an opponent controls until Faith Unbroken leaves the battlefield. diff --git a/Mage.Sets/src/mage/cards/f/FaithsFetters.java b/Mage.Sets/src/mage/cards/f/FaithsFetters.java index 336a4d52617..841098e06e8 100644 --- a/Mage.Sets/src/mage/cards/f/FaithsFetters.java +++ b/Mage.Sets/src/mage/cards/f/FaithsFetters.java @@ -33,7 +33,7 @@ public final class FaithsFetters extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Faith's Fetters enters the battlefield, you gain 4 life. diff --git a/Mage.Sets/src/mage/cards/f/FallFromFavor.java b/Mage.Sets/src/mage/cards/f/FallFromFavor.java index 53a34af64ad..ed410c2819b 100644 --- a/Mage.Sets/src/mage/cards/f/FallFromFavor.java +++ b/Mage.Sets/src/mage/cards/f/FallFromFavor.java @@ -34,7 +34,7 @@ public final class FallFromFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Fall from Favor enters the battlefield, tap enchanted creature and you become the monarch. diff --git a/Mage.Sets/src/mage/cards/f/FallenIdeal.java b/Mage.Sets/src/mage/cards/f/FallenIdeal.java index e181745d618..3dd1e9d51d0 100644 --- a/Mage.Sets/src/mage/cards/f/FallenIdeal.java +++ b/Mage.Sets/src/mage/cards/f/FallenIdeal.java @@ -35,7 +35,7 @@ public final class FallenIdeal extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has flying and "Sacrifice a creature: This creature gets +2/+1 until end of turn." Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/f/FalseDemise.java b/Mage.Sets/src/mage/cards/f/FalseDemise.java index 7c098e02391..585678f9d12 100644 --- a/Mage.Sets/src/mage/cards/f/FalseDemise.java +++ b/Mage.Sets/src/mage/cards/f/FalseDemise.java @@ -30,7 +30,7 @@ public final class FalseDemise extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, return that card to the battlefield under your control. diff --git a/Mage.Sets/src/mage/cards/f/Farmstead.java b/Mage.Sets/src/mage/cards/f/Farmstead.java index 70856563750..a56895f350d 100644 --- a/Mage.Sets/src/mage/cards/f/Farmstead.java +++ b/Mage.Sets/src/mage/cards/f/Farmstead.java @@ -31,7 +31,7 @@ public final class Farmstead extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "At the beginning of your upkeep, you may pay {W}{W}. If you do, you gain 1 life." diff --git a/Mage.Sets/src/mage/cards/f/FarrelsMantle.java b/Mage.Sets/src/mage/cards/f/FarrelsMantle.java index cfb64e43bb6..ff45f1d783c 100644 --- a/Mage.Sets/src/mage/cards/f/FarrelsMantle.java +++ b/Mage.Sets/src/mage/cards/f/FarrelsMantle.java @@ -37,7 +37,7 @@ public final class FarrelsMantle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks and isn't blocked, its controller may have it deal damage equal to its power plus 2 to another target creature. If that player does, the attacking creature assigns no combat damage this turn. diff --git a/Mage.Sets/src/mage/cards/f/FatalAttraction.java b/Mage.Sets/src/mage/cards/f/FatalAttraction.java index 9f8cf953d84..0b16d03d790 100644 --- a/Mage.Sets/src/mage/cards/f/FatalAttraction.java +++ b/Mage.Sets/src/mage/cards/f/FatalAttraction.java @@ -32,7 +32,7 @@ public final class FatalAttraction extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Fatal Attraction enters the battlefield, it deals 2 damage to enchanted creature. diff --git a/Mage.Sets/src/mage/cards/f/FatalMutation.java b/Mage.Sets/src/mage/cards/f/FatalMutation.java index 7cb537441a4..8a1a01873db 100644 --- a/Mage.Sets/src/mage/cards/f/FatalMutation.java +++ b/Mage.Sets/src/mage/cards/f/FatalMutation.java @@ -34,7 +34,7 @@ public final class FatalMutation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature is turned face up, destroy it. It can't be regenerated. this.addAbility(new FatalMutationAbility(new DestroyAttachedToEffect("it", true))); diff --git a/Mage.Sets/src/mage/cards/f/FateForetold.java b/Mage.Sets/src/mage/cards/f/FateForetold.java index 73a355d0b77..c21a2b2e062 100644 --- a/Mage.Sets/src/mage/cards/f/FateForetold.java +++ b/Mage.Sets/src/mage/cards/f/FateForetold.java @@ -31,7 +31,7 @@ public final class FateForetold extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Fate Foretold enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1),false)); diff --git a/Mage.Sets/src/mage/cards/f/FavorOfJukai.java b/Mage.Sets/src/mage/cards/f/FavorOfJukai.java index f038a205515..4bd3db1bedf 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfJukai.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfJukai.java @@ -41,7 +41,7 @@ public final class FavorOfJukai extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted permanent is a creature, it gets +3/+3 and has reach. Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java b/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java index b89797dd2c4..0bd0df63850 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheOverbeing.java @@ -38,7 +38,7 @@ public final class FavorOfTheOverbeing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is green, it gets +1/+1 and has vigilance. SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheWoods.java b/Mage.Sets/src/mage/cards/f/FavorOfTheWoods.java index 6a25ce7ff3e..38686f74618 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheWoods.java @@ -30,7 +30,7 @@ public final class FavorOfTheWoods extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature blocks, you gain 3 life. this.addAbility(new BlocksAttachedTriggeredAbility(new GainLifeEffect(3), "enchanted", false)); diff --git a/Mage.Sets/src/mage/cards/f/FavorableDestiny.java b/Mage.Sets/src/mage/cards/f/FavorableDestiny.java index 7b89786a65b..08f319ec99b 100644 --- a/Mage.Sets/src/mage/cards/f/FavorableDestiny.java +++ b/Mage.Sets/src/mage/cards/f/FavorableDestiny.java @@ -41,7 +41,7 @@ public final class FavorableDestiny extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2 as long as it's white. diff --git a/Mage.Sets/src/mage/cards/f/Fear.java b/Mage.Sets/src/mage/cards/f/Fear.java index 6180e200418..a7ed049fc7c 100644 --- a/Mage.Sets/src/mage/cards/f/Fear.java +++ b/Mage.Sets/src/mage/cards/f/Fear.java @@ -33,7 +33,7 @@ public final class Fear extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has fear. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FearAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/f/FearOfDeath.java b/Mage.Sets/src/mage/cards/f/FearOfDeath.java index 227a273b253..3884328b730 100644 --- a/Mage.Sets/src/mage/cards/f/FearOfDeath.java +++ b/Mage.Sets/src/mage/cards/f/FearOfDeath.java @@ -40,7 +40,7 @@ public final class FearOfDeath extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Fear of Death enters the battlefield, mill two cards. this.addAbility(new EntersBattlefieldTriggeredAbility(new MillCardsControllerEffect(2))); diff --git a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java index 5c7fc8f3997..48b8c7ae65c 100644 --- a/Mage.Sets/src/mage/cards/f/FearsomeTemper.java +++ b/Mage.Sets/src/mage/cards/f/FearsomeTemper.java @@ -33,7 +33,7 @@ public final class FearsomeTemper extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{2}{R}: Target creature can't block this creature this turn." diff --git a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java index 5882bb70b49..e12778852c3 100644 --- a/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java +++ b/Mage.Sets/src/mage/cards/f/FeastOfTheUnicorn.java @@ -32,7 +32,7 @@ public final class FeastOfTheUnicorn extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +4/+0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 0, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/f/Feebleness.java b/Mage.Sets/src/mage/cards/f/Feebleness.java index fa68ff3f587..e4f80309739 100644 --- a/Mage.Sets/src/mage/cards/f/Feebleness.java +++ b/Mage.Sets/src/mage/cards/f/Feebleness.java @@ -34,7 +34,7 @@ public final class Feebleness extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/f/Feedback.java b/Mage.Sets/src/mage/cards/f/Feedback.java index 5a8f9ee64e4..10e644220e1 100644 --- a/Mage.Sets/src/mage/cards/f/Feedback.java +++ b/Mage.Sets/src/mage/cards/f/Feedback.java @@ -30,7 +30,7 @@ public final class Feedback extends CardImpl { TargetPermanent auraTarget = new TargetEnchantmentPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of the upkeep of enchanted enchantment's controller, Feedback deals 1 damage to that player. Effect effect = new DamageTargetEffect(1); diff --git a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java index 4220d09b071..8d2c68b5dfb 100644 --- a/Mage.Sets/src/mage/cards/f/FelidarUmbra.java +++ b/Mage.Sets/src/mage/cards/f/FelidarUmbra.java @@ -37,7 +37,7 @@ public final class FelidarUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainLife)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has lifelink. diff --git a/Mage.Sets/src/mage/cards/f/FencersMagemark.java b/Mage.Sets/src/mage/cards/f/FencersMagemark.java index cb679cbd255..e646bdfd7cb 100644 --- a/Mage.Sets/src/mage/cards/f/FencersMagemark.java +++ b/Mage.Sets/src/mage/cards/f/FencersMagemark.java @@ -38,7 +38,7 @@ public final class FencersMagemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1 and have first strike. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); diff --git a/Mage.Sets/src/mage/cards/f/FeralInvocation.java b/Mage.Sets/src/mage/cards/f/FeralInvocation.java index 19c09f1342f..ee5d4a0aa43 100644 --- a/Mage.Sets/src/mage/cards/f/FeralInvocation.java +++ b/Mage.Sets/src/mage/cards/f/FeralInvocation.java @@ -35,7 +35,7 @@ public final class FeralInvocation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/f/Ferocity.java b/Mage.Sets/src/mage/cards/f/Ferocity.java index 3f7ea48e28b..b6e7b203707 100644 --- a/Mage.Sets/src/mage/cards/f/Ferocity.java +++ b/Mage.Sets/src/mage/cards/f/Ferocity.java @@ -29,7 +29,7 @@ public final class Ferocity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature blocks or becomes blocked, you may put a +1/+1 counter on it. this.addAbility(new BlocksOrBlockedAttachedTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/f/FertileGround.java b/Mage.Sets/src/mage/cards/f/FertileGround.java index 26cdef298ac..707643f0d5d 100644 --- a/Mage.Sets/src/mage/cards/f/FertileGround.java +++ b/Mage.Sets/src/mage/cards/f/FertileGround.java @@ -28,7 +28,7 @@ public final class FertileGround extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land is tapped for mana, its controller adds one mana of any color. diff --git a/Mage.Sets/src/mage/cards/f/FesteringWound.java b/Mage.Sets/src/mage/cards/f/FesteringWound.java index d870c05fbec..38259c921a8 100644 --- a/Mage.Sets/src/mage/cards/f/FesteringWound.java +++ b/Mage.Sets/src/mage/cards/f/FesteringWound.java @@ -31,7 +31,7 @@ public final class FesteringWound extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, you may put an infection counter on Festering Wound. diff --git a/Mage.Sets/src/mage/cards/f/FieldOfReality.java b/Mage.Sets/src/mage/cards/f/FieldOfReality.java index c7175ec4e89..07dfd40204d 100644 --- a/Mage.Sets/src/mage/cards/f/FieldOfReality.java +++ b/Mage.Sets/src/mage/cards/f/FieldOfReality.java @@ -29,7 +29,7 @@ public final class FieldOfReality extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't be blocked by Spirits. this.addAbility(new SimpleEvasionAbility(new CantBeBlockedByCreaturesAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/f/FieryMantle.java b/Mage.Sets/src/mage/cards/f/FieryMantle.java index 325a4b1e019..bae0acb82fd 100644 --- a/Mage.Sets/src/mage/cards/f/FieryMantle.java +++ b/Mage.Sets/src/mage/cards/f/FieryMantle.java @@ -30,7 +30,7 @@ public final class FieryMantle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/f/FindThePath.java b/Mage.Sets/src/mage/cards/f/FindThePath.java index 647f735b845..9f3464fb630 100644 --- a/Mage.Sets/src/mage/cards/f/FindThePath.java +++ b/Mage.Sets/src/mage/cards/f/FindThePath.java @@ -32,7 +32,7 @@ public final class FindThePath extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Find the Path enters the battlefield, venture into the dungeon. diff --git a/Mage.Sets/src/mage/cards/f/FireWhip.java b/Mage.Sets/src/mage/cards/f/FireWhip.java index bcb580fc552..f062d5fe3ad 100644 --- a/Mage.Sets/src/mage/cards/f/FireWhip.java +++ b/Mage.Sets/src/mage/cards/f/FireWhip.java @@ -33,7 +33,7 @@ public final class FireWhip extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{t}: This creature deals 1 damage to any target." diff --git a/Mage.Sets/src/mage/cards/f/Firebreathing.java b/Mage.Sets/src/mage/cards/f/Firebreathing.java index 92045591af8..e6c85d29621 100644 --- a/Mage.Sets/src/mage/cards/f/Firebreathing.java +++ b/Mage.Sets/src/mage/cards/f/Firebreathing.java @@ -28,7 +28,7 @@ public final class Firebreathing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/f/FishliverOil.java b/Mage.Sets/src/mage/cards/f/FishliverOil.java index 360dc973cf9..b6e528b3b50 100644 --- a/Mage.Sets/src/mage/cards/f/FishliverOil.java +++ b/Mage.Sets/src/mage/cards/f/FishliverOil.java @@ -31,7 +31,7 @@ public final class FishliverOil extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has islandwalk. diff --git a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java index d2ac82f9273..bfe9b308f38 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfIronwood.java @@ -36,7 +36,7 @@ public final class FistsOfIronwood extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Fists of Ironwood enters the battlefield, create two 1/1 green Saproling creature tokens. this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new SaprolingToken(), 2), false)); diff --git a/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java b/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java index aef5e67ec70..558c308445c 100644 --- a/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java +++ b/Mage.Sets/src/mage/cards/f/FistsOfTheDemigod.java @@ -38,7 +38,7 @@ public final class FistsOfTheDemigod extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is black, it gets +1/+1 and has wither. SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java b/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java index 2d057c563d7..c3b824d21d0 100644 --- a/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java +++ b/Mage.Sets/src/mage/cards/f/FlamespeakersWill.java @@ -33,7 +33,7 @@ public final class FlamespeakersWill extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/f/FlamingSword.java b/Mage.Sets/src/mage/cards/f/FlamingSword.java index 81bd9891cdd..1a88cc61d0d 100644 --- a/Mage.Sets/src/mage/cards/f/FlamingSword.java +++ b/Mage.Sets/src/mage/cards/f/FlamingSword.java @@ -40,7 +40,7 @@ public final class FlamingSword extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0 and has first strike. diff --git a/Mage.Sets/src/mage/cards/f/Flickerform.java b/Mage.Sets/src/mage/cards/f/Flickerform.java index 5fd27597742..2c00f710420 100644 --- a/Mage.Sets/src/mage/cards/f/Flickerform.java +++ b/Mage.Sets/src/mage/cards/f/Flickerform.java @@ -44,7 +44,7 @@ public final class Flickerform extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {2}{W}{W}: Exile enchanted creature and all Auras attached to it. At the beginning of the next end step, return that card to the battlefield under its owner's control. If you do, return the other cards exiled this way to the battlefield under their owners' control attached to that creature. diff --git a/Mage.Sets/src/mage/cards/f/FlickeringWard.java b/Mage.Sets/src/mage/cards/f/FlickeringWard.java index b47af5c62df..e036567ef2d 100644 --- a/Mage.Sets/src/mage/cards/f/FlickeringWard.java +++ b/Mage.Sets/src/mage/cards/f/FlickeringWard.java @@ -34,7 +34,7 @@ public final class FlickeringWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As Flickering Ward enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); diff --git a/Mage.Sets/src/mage/cards/f/Flight.java b/Mage.Sets/src/mage/cards/f/Flight.java index 8aa1da38949..9ca193dba97 100644 --- a/Mage.Sets/src/mage/cards/f/Flight.java +++ b/Mage.Sets/src/mage/cards/f/Flight.java @@ -32,7 +32,7 @@ public final class Flight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. diff --git a/Mage.Sets/src/mage/cards/f/FlightOfFancy.java b/Mage.Sets/src/mage/cards/f/FlightOfFancy.java index 28115a03d92..d7e67dd3ec0 100644 --- a/Mage.Sets/src/mage/cards/f/FlightOfFancy.java +++ b/Mage.Sets/src/mage/cards/f/FlightOfFancy.java @@ -35,7 +35,7 @@ public final class FlightOfFancy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Flight of Fancy enters the battlefield, draw two cards. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(2), false)); diff --git a/Mage.Sets/src/mage/cards/f/FloatingShield.java b/Mage.Sets/src/mage/cards/f/FloatingShield.java index 69a4571c5d8..c825796182a 100644 --- a/Mage.Sets/src/mage/cards/f/FloatingShield.java +++ b/Mage.Sets/src/mage/cards/f/FloatingShield.java @@ -38,7 +38,7 @@ public final class FloatingShield extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As Floating Shield enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Protect))); diff --git a/Mage.Sets/src/mage/cards/f/FloweringField.java b/Mage.Sets/src/mage/cards/f/FloweringField.java index 6c9b7b55459..5b4f3eec5bc 100644 --- a/Mage.Sets/src/mage/cards/f/FloweringField.java +++ b/Mage.Sets/src/mage/cards/f/FloweringField.java @@ -32,7 +32,7 @@ public final class FloweringField extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to any target this turn." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java b/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java index 54b85d68033..afb695abae5 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneBlade.java @@ -32,7 +32,7 @@ public final class FlowstoneBlade extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Copy)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {R}: Enchanted creature gets +1/-1 until end of turn. diff --git a/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java b/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java index a75edcf53e1..8cdb6f48efd 100644 --- a/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java +++ b/Mage.Sets/src/mage/cards/f/FlowstoneEmbrace.java @@ -32,7 +32,7 @@ public final class FlowstoneEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {tap}: Enchanted creature gets +2/-2 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -2, Duration.EndOfTurn), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/f/Fly.java b/Mage.Sets/src/mage/cards/f/Fly.java index 413f5d802e4..b45ef4297eb 100644 --- a/Mage.Sets/src/mage/cards/f/Fly.java +++ b/Mage.Sets/src/mage/cards/f/Fly.java @@ -34,7 +34,7 @@ public final class Fly extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying and "Whenever this creature deals combat damage to a player, venture into the dungeon." diff --git a/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java b/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java index 352384a18f2..82230487ff8 100644 --- a/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java +++ b/Mage.Sets/src/mage/cards/f/FollowedFootsteps.java @@ -36,7 +36,7 @@ public final class FollowedFootsteps extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Copy)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, create a token that's a copy of enchanted creature. diff --git a/Mage.Sets/src/mage/cards/f/FoolsDemise.java b/Mage.Sets/src/mage/cards/f/FoolsDemise.java index 69198c14786..25880ba47ea 100644 --- a/Mage.Sets/src/mage/cards/f/FoolsDemise.java +++ b/Mage.Sets/src/mage/cards/f/FoolsDemise.java @@ -32,7 +32,7 @@ public final class FoolsDemise extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, return that card to the battlefield under your control. diff --git a/Mage.Sets/src/mage/cards/f/FootfallCrater.java b/Mage.Sets/src/mage/cards/f/FootfallCrater.java index 54d642fc12a..c4896a100f0 100644 --- a/Mage.Sets/src/mage/cards/f/FootfallCrater.java +++ b/Mage.Sets/src/mage/cards/f/FootfallCrater.java @@ -35,7 +35,7 @@ public final class FootfallCrater extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Target creature gains trample and haste until end of turn." diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java index a9d517dda7b..85edf1cebc1 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenLore.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenLore.java @@ -31,7 +31,7 @@ public final class ForbiddenLore extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: Target creature gets +2/+1 until end of turn." Ability gainAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(2, 1, Duration.EndOfTurn), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/f/ForcedAdaptation.java b/Mage.Sets/src/mage/cards/f/ForcedAdaptation.java index 079bd6b64ca..4d13f700bd4 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedAdaptation.java +++ b/Mage.Sets/src/mage/cards/f/ForcedAdaptation.java @@ -32,7 +32,7 @@ public final class ForcedAdaptation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, put a +1/+1 counter on enchanted creature. diff --git a/Mage.Sets/src/mage/cards/f/ForcedWorship.java b/Mage.Sets/src/mage/cards/f/ForcedWorship.java index ce2b0b1632a..75f49309efb 100644 --- a/Mage.Sets/src/mage/cards/f/ForcedWorship.java +++ b/Mage.Sets/src/mage/cards/f/ForcedWorship.java @@ -36,7 +36,7 @@ public final class ForcedWorship extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackAttachedEffect(AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/f/Fortitude.java b/Mage.Sets/src/mage/cards/f/Fortitude.java index e8ccf06816c..a01339a8e08 100644 --- a/Mage.Sets/src/mage/cards/f/Fortitude.java +++ b/Mage.Sets/src/mage/cards/f/Fortitude.java @@ -38,7 +38,7 @@ public final class Fortitude extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Sacrifice a Forest: Regenerate enchanted creature. diff --git a/Mage.Sets/src/mage/cards/f/FoulPresence.java b/Mage.Sets/src/mage/cards/f/FoulPresence.java index 71cb9644ed0..230dd49d726 100644 --- a/Mage.Sets/src/mage/cards/f/FoulPresence.java +++ b/Mage.Sets/src/mage/cards/f/FoulPresence.java @@ -32,7 +32,7 @@ public final class FoulPresence extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -1/-1 and has "{T}: Target creature gets -1/-1 until end of turn." ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/f/FowlPlay.java b/Mage.Sets/src/mage/cards/f/FowlPlay.java index 94fe9e28b93..f467e17b2e0 100644 --- a/Mage.Sets/src/mage/cards/f/FowlPlay.java +++ b/Mage.Sets/src/mage/cards/f/FowlPlay.java @@ -28,7 +28,7 @@ public final class FowlPlay extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature is a Bird with base power and toughness 1/1 and loses all abilities. diff --git a/Mage.Sets/src/mage/cards/f/FracturedLoyalty.java b/Mage.Sets/src/mage/cards/f/FracturedLoyalty.java index 268da9d0199..644ca6424ae 100644 --- a/Mage.Sets/src/mage/cards/f/FracturedLoyalty.java +++ b/Mage.Sets/src/mage/cards/f/FracturedLoyalty.java @@ -34,7 +34,7 @@ public final class FracturedLoyalty extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature becomes the target of a spell or ability, that spell or ability's controller gains control of that creature. diff --git a/Mage.Sets/src/mage/cards/f/FrayingSanity.java b/Mage.Sets/src/mage/cards/f/FrayingSanity.java index 13c3805d8c4..a74d994fe29 100644 --- a/Mage.Sets/src/mage/cards/f/FrayingSanity.java +++ b/Mage.Sets/src/mage/cards/f/FrayingSanity.java @@ -35,7 +35,7 @@ public final class FrayingSanity extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of each end step, enchanted player puts the top X cards of their library into their graveyard, where X is the total number of cards put into their graveyard from anywhere this turn. diff --git a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java index 1d2cd16cf2b..8246945c464 100644 --- a/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java +++ b/Mage.Sets/src/mage/cards/f/FreedFromTheReal.java @@ -31,7 +31,7 @@ public final class FreedFromTheReal extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // {U}: Tap enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new ManaCostsImpl<>("{U}"))); // {U}: Untap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/f/FrenziedFugue.java b/Mage.Sets/src/mage/cards/f/FrenziedFugue.java index 36982215389..8fa6595e2e7 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedFugue.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedFugue.java @@ -35,7 +35,7 @@ public final class FrenziedFugue extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Frenzied Fugue enters the battlefield or at the beginning of your upkeep, gain control of enchanted permanent until end of turn. Untap that permanent. It gains haste until end of turn. this.addAbility(new FrenziedFugueTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/f/FrenziedRage.java b/Mage.Sets/src/mage/cards/f/FrenziedRage.java index de51f6e52d6..d64d1d5f8f6 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedRage.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedRage.java @@ -35,7 +35,7 @@ public final class FrenziedRage extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1 and has menace. diff --git a/Mage.Sets/src/mage/cards/f/FrogTongue.java b/Mage.Sets/src/mage/cards/f/FrogTongue.java index 0360cd55cd3..61e1286c6b9 100644 --- a/Mage.Sets/src/mage/cards/f/FrogTongue.java +++ b/Mage.Sets/src/mage/cards/f/FrogTongue.java @@ -32,7 +32,7 @@ public final class FrogTongue extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/f/Frogify.java b/Mage.Sets/src/mage/cards/f/Frogify.java index f6e138d93fa..8e2bbdf416e 100644 --- a/Mage.Sets/src/mage/cards/f/Frogify.java +++ b/Mage.Sets/src/mage/cards/f/Frogify.java @@ -31,7 +31,7 @@ public final class Frogify extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature loses all abilities and is a blue Frog creature with base power and toughness 1/1. diff --git a/Mage.Sets/src/mage/cards/f/FrozenSolid.java b/Mage.Sets/src/mage/cards/f/FrozenSolid.java index 40731a08447..4c4105b5e79 100644 --- a/Mage.Sets/src/mage/cards/f/FrozenSolid.java +++ b/Mage.Sets/src/mage/cards/f/FrozenSolid.java @@ -32,7 +32,7 @@ public final class FrozenSolid extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/f/FruitOfTheFirstTree.java b/Mage.Sets/src/mage/cards/f/FruitOfTheFirstTree.java index 01b4f8795ba..c3ca9c4315c 100644 --- a/Mage.Sets/src/mage/cards/f/FruitOfTheFirstTree.java +++ b/Mage.Sets/src/mage/cards/f/FruitOfTheFirstTree.java @@ -33,7 +33,7 @@ public final class FruitOfTheFirstTree extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, you gain X life and draw X cards, where X is its toughness. diff --git a/Mage.Sets/src/mage/cards/f/FuneralMarch.java b/Mage.Sets/src/mage/cards/f/FuneralMarch.java index 889208ca219..4790c8fe50a 100644 --- a/Mage.Sets/src/mage/cards/f/FuneralMarch.java +++ b/Mage.Sets/src/mage/cards/f/FuneralMarch.java @@ -36,7 +36,7 @@ public final class FuneralMarch extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature leaves the battlefield, its controller sacrifices a creature. diff --git a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java index c5e969d664f..b1f0b3565fa 100644 --- a/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java +++ b/Mage.Sets/src/mage/cards/f/FurorOfTheBitten.java @@ -29,7 +29,7 @@ public final class FurorOfTheBitten extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 and attacks each turn if able. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/f/Fylgja.java b/Mage.Sets/src/mage/cards/f/Fylgja.java index 9e35a75c7f4..9ab5a548b0e 100644 --- a/Mage.Sets/src/mage/cards/f/Fylgja.java +++ b/Mage.Sets/src/mage/cards/f/Fylgja.java @@ -37,7 +37,7 @@ public final class Fylgja extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Fylgja enters the battlefield with four healing counters on it. diff --git a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java index d2fec0ca39c..ad133730d03 100644 --- a/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java +++ b/Mage.Sets/src/mage/cards/g/GaeasEmbrace.java @@ -32,7 +32,7 @@ public final class GaeasEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and has trample. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3)); diff --git a/Mage.Sets/src/mage/cards/g/GalvanicArc.java b/Mage.Sets/src/mage/cards/g/GalvanicArc.java index 2ad5e3a94e5..0b1f71c3528 100644 --- a/Mage.Sets/src/mage/cards/g/GalvanicArc.java +++ b/Mage.Sets/src/mage/cards/g/GalvanicArc.java @@ -36,7 +36,7 @@ public final class GalvanicArc extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Galvanic Arc enters the battlefield, it deals 3 damage to any target. Ability triggeredAbility = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3, "it")); diff --git a/Mage.Sets/src/mage/cards/g/GaseousForm.java b/Mage.Sets/src/mage/cards/g/GaseousForm.java index fe192fc5eee..61d1f00ebcb 100644 --- a/Mage.Sets/src/mage/cards/g/GaseousForm.java +++ b/Mage.Sets/src/mage/cards/g/GaseousForm.java @@ -26,7 +26,7 @@ public final class GaseousForm extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Prevent all combat damage that would be dealt to and dealt by enchanted creature. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageToAndByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", true))); diff --git a/Mage.Sets/src/mage/cards/g/GauntletsOfLight.java b/Mage.Sets/src/mage/cards/g/GauntletsOfLight.java index 6f8b6ec324b..ee24352573d 100644 --- a/Mage.Sets/src/mage/cards/g/GauntletsOfLight.java +++ b/Mage.Sets/src/mage/cards/g/GauntletsOfLight.java @@ -36,7 +36,7 @@ public final class GauntletsOfLight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2 and assigns combat damage equal to its toughness rather than its power. @@ -100,4 +100,4 @@ class GauntletsOfLightEffect extends ContinuousEffectImpl { public boolean hasLayer(Layer layer) { return layer == Layer.RulesEffects; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GelidShackles.java b/Mage.Sets/src/mage/cards/g/GelidShackles.java index fabb2f48f8a..90e1b4e09de 100644 --- a/Mage.Sets/src/mage/cards/g/GelidShackles.java +++ b/Mage.Sets/src/mage/cards/g/GelidShackles.java @@ -32,7 +32,7 @@ public final class GelidShackles extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't block, and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java index 6edb4b36d8a..0c7246a6c97 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheCedars.java @@ -36,7 +36,7 @@ public final class GenjuOfTheCedars extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {2}: Enchanted Forest becomes a 4/4 green Spirit creature until end of turn. It's still a land. diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java index f79bc849d75..7784a799888 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFalls.java @@ -36,7 +36,7 @@ public final class GenjuOfTheFalls extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(FILTER); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {2}: Enchanted Island becomes a 3/2 blue Spirit creature with flying until end of turn. It's still a land. diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java index 9385c8de505..f868b690fd5 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFens.java @@ -37,7 +37,7 @@ public final class GenjuOfTheFens extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(FILTER); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {2}: Until end of turn, enchanted Swamp becomes a 2/2 black Spirit creature with "{B}: This creature gets +1/+1 until end of turn." It's still a land. diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java index a52b4496fa8..e7e17471f7e 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheFields.java @@ -38,7 +38,7 @@ public final class GenjuOfTheFields extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(FILTER); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {2}: Until end of turn, enchanted Plains becomes a 2/5 white Spirit creature with "Whenever this creature deals damage, its controller gains that much life." It's still a land. diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java index d0604862fec..69d1fecb04c 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheRealm.java @@ -34,7 +34,7 @@ public final class GenjuOfTheRealm extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {2}: Enchanted land becomes a legendary 8/12 Spirit creature with trample until end of turn. It's still a land. diff --git a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java index 9c44463c332..3d6c2297d03 100644 --- a/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java +++ b/Mage.Sets/src/mage/cards/g/GenjuOfTheSpires.java @@ -35,7 +35,7 @@ public final class GenjuOfTheSpires extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(FILTER); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {2}: Enchanted Mountain becomes a 6/1 red Spirit creature until end of turn. It's still a land. diff --git a/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java b/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java index d8165558962..cda6355d838 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyHaunting.java @@ -30,7 +30,7 @@ public final class GhastlyHaunting extends CardImpl { // Enchant creature TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // You control enchanted creature. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/g/GhastlyMimicry.java b/Mage.Sets/src/mage/cards/g/GhastlyMimicry.java index e250267c673..054d3a5bf29 100644 --- a/Mage.Sets/src/mage/cards/g/GhastlyMimicry.java +++ b/Mage.Sets/src/mage/cards/g/GhastlyMimicry.java @@ -38,7 +38,7 @@ public final class GhastlyMimicry extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, create a token that's a copy of enchanted creature, except it's a Spirit in addition to its other types. diff --git a/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java b/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java index ba5175fc22e..675e36c4dee 100644 --- a/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java +++ b/Mage.Sets/src/mage/cards/g/GhituFirebreathing.java @@ -34,7 +34,7 @@ public final class GhituFirebreathing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {R}: Enchanted creature gets +1/+0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/g/GhostlyPossession.java b/Mage.Sets/src/mage/cards/g/GhostlyPossession.java index 35183c5727c..854dc8e92e5 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyPossession.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyPossession.java @@ -28,7 +28,7 @@ public final class GhostlyPossession extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); //Enchanted creature has flying diff --git a/Mage.Sets/src/mage/cards/g/GhostlyTouch.java b/Mage.Sets/src/mage/cards/g/GhostlyTouch.java index a790c6b8e07..61848e91677 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyTouch.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyTouch.java @@ -35,7 +35,7 @@ public final class GhostlyTouch extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever this creature attacks, you may tap or untap target permanent." diff --git a/Mage.Sets/src/mage/cards/g/GhostlyWings.java b/Mage.Sets/src/mage/cards/g/GhostlyWings.java index 84d4545ccf3..42979504fec 100644 --- a/Mage.Sets/src/mage/cards/g/GhostlyWings.java +++ b/Mage.Sets/src/mage/cards/g/GhostlyWings.java @@ -36,7 +36,7 @@ public final class GhostlyWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying. diff --git a/Mage.Sets/src/mage/cards/g/Ghoulflesh.java b/Mage.Sets/src/mage/cards/g/Ghoulflesh.java index a3d9bbf05cc..ded0c933bd5 100644 --- a/Mage.Sets/src/mage/cards/g/Ghoulflesh.java +++ b/Mage.Sets/src/mage/cards/g/Ghoulflesh.java @@ -29,7 +29,7 @@ public final class Ghoulflesh extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets -1/-1 and is a black Zombie in addition to its other colors and types. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/g/GiantSpectacle.java b/Mage.Sets/src/mage/cards/g/GiantSpectacle.java index e01de406b22..530e4dfe0fd 100644 --- a/Mage.Sets/src/mage/cards/g/GiantSpectacle.java +++ b/Mage.Sets/src/mage/cards/g/GiantSpectacle.java @@ -34,7 +34,7 @@ public final class GiantSpectacle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1 and has menace. diff --git a/Mage.Sets/src/mage/cards/g/GiantStrength.java b/Mage.Sets/src/mage/cards/g/GiantStrength.java index 50b165a95b1..8a6e390f325 100644 --- a/Mage.Sets/src/mage/cards/g/GiantStrength.java +++ b/Mage.Sets/src/mage/cards/g/GiantStrength.java @@ -30,7 +30,7 @@ public final class GiantStrength extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/g/GiantsGrasp.java b/Mage.Sets/src/mage/cards/g/GiantsGrasp.java index 58dde06ee94..a6600e37704 100644 --- a/Mage.Sets/src/mage/cards/g/GiantsGrasp.java +++ b/Mage.Sets/src/mage/cards/g/GiantsGrasp.java @@ -35,7 +35,7 @@ public final class GiantsGrasp extends CardImpl { this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.getSpellAbility().addTarget(auraTarget); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Giant's Grasp enters the battlefield, gain control of target nonland permanent for as long as Giant's Grasp remains on the battlefield. diff --git a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java index 6d0f82e7bdf..6529f8f564b 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfDoom.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfDoom.java @@ -51,7 +51,7 @@ public final class GiftOfDoom extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.getSpellAbility().setTargetAdjuster(GiftOfDoomAdjuster.instance); // to remove the target set if Morph casting cost is paid - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has deathtouch and indestructible. diff --git a/Mage.Sets/src/mage/cards/g/GiftOfFangs.java b/Mage.Sets/src/mage/cards/g/GiftOfFangs.java index c3b9bdad602..a5168a44343 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfFangs.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfFangs.java @@ -31,7 +31,7 @@ public final class GiftOfFangs extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as it's a Vampire. Otherwise, it gets -2/-2. diff --git a/Mage.Sets/src/mage/cards/g/GiftOfGranite.java b/Mage.Sets/src/mage/cards/g/GiftOfGranite.java index ee0cb8a22d2..9cf67416120 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfGranite.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfGranite.java @@ -36,7 +36,7 @@ public final class GiftOfGranite extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2. diff --git a/Mage.Sets/src/mage/cards/g/GiftOfImmortality.java b/Mage.Sets/src/mage/cards/g/GiftOfImmortality.java index 3b7b039905b..f21e5cdfa84 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfImmortality.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfImmortality.java @@ -38,7 +38,7 @@ public final class GiftOfImmortality extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, return that card to the battlefield under its owner's control. diff --git a/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java b/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java index f694829f713..09fa752f2c0 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfOrzhova.java @@ -31,7 +31,7 @@ public final class GiftOfOrzhova extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying and lifelink. diff --git a/Mage.Sets/src/mage/cards/g/GiftOfParadise.java b/Mage.Sets/src/mage/cards/g/GiftOfParadise.java index 71bb2204d44..7491937806f 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfParadise.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfParadise.java @@ -38,7 +38,7 @@ public final class GiftOfParadise extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Gift of Paradise enters the battlefield, you gain 3 life. diff --git a/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java b/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java index 3b9ebdb7fb4..1eaa8ff7de4 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfTheDeity.java @@ -40,7 +40,7 @@ public final class GiftOfTheDeity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is black, it gets +1/+1 and has deathtouch. SimpleStaticAbility blackAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLACK), "As long as enchanted creature is black, it gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/g/GiftOfTheWoods.java b/Mage.Sets/src/mage/cards/g/GiftOfTheWoods.java index e78b9676f0b..fe16bfd81c2 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfTheWoods.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfTheWoods.java @@ -30,7 +30,7 @@ public final class GiftOfTheWoods extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); this.getSpellAbility().addTarget(auraTarget); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature blocks or becomes blocked, it gets +0/+3 until end of turn and you gain 1 life. Ability ability = new BlocksOrBlockedAttachedTriggeredAbility(new BoostTargetEffect(0, 3).setText("it gets +0/+3 until end of turn")); diff --git a/Mage.Sets/src/mage/cards/g/GiftOfWrath.java b/Mage.Sets/src/mage/cards/g/GiftOfWrath.java index 2576d3f871f..be9f86e6a92 100644 --- a/Mage.Sets/src/mage/cards/g/GiftOfWrath.java +++ b/Mage.Sets/src/mage/cards/g/GiftOfWrath.java @@ -40,7 +40,7 @@ public final class GiftOfWrath extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted permanent is a creature, it gets +2/+2 and has menace. Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/g/Gigantiform.java b/Mage.Sets/src/mage/cards/g/Gigantiform.java index bcadb780736..10145c0540d 100644 --- a/Mage.Sets/src/mage/cards/g/Gigantiform.java +++ b/Mage.Sets/src/mage/cards/g/Gigantiform.java @@ -44,7 +44,7 @@ public final class Gigantiform extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has base power and toughness 8/8 and has trample. this.addAbility(new GigantiformAbility()); diff --git a/Mage.Sets/src/mage/cards/g/GlacialPlating.java b/Mage.Sets/src/mage/cards/g/GlacialPlating.java index 725f78c51aa..3a087736aa1 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialPlating.java +++ b/Mage.Sets/src/mage/cards/g/GlacialPlating.java @@ -41,7 +41,7 @@ public final class GlacialPlating extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Cumulative upkeep {snow} diff --git a/Mage.Sets/src/mage/cards/g/GlaringAegis.java b/Mage.Sets/src/mage/cards/g/GlaringAegis.java index e46838c2b3a..dbd03e8673c 100644 --- a/Mage.Sets/src/mage/cards/g/GlaringAegis.java +++ b/Mage.Sets/src/mage/cards/g/GlaringAegis.java @@ -30,7 +30,7 @@ public final class GlaringAegis extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Glaring Aegis enters the battlefield, tap target creature an opponent controls. diff --git a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java index fc6f3c24b1f..65693ecd15e 100644 --- a/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java +++ b/Mage.Sets/src/mage/cards/g/GleamOfAuthority.java @@ -39,7 +39,7 @@ public final class GleamOfAuthority extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 for each +1/+1 counter on other creatures you control diff --git a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java index a89eec4a2b6..9f43455a1e5 100644 --- a/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java +++ b/Mage.Sets/src/mage/cards/g/GlimmerdustNap.java @@ -38,7 +38,7 @@ public final class GlimmerdustNap extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/g/GlisteningOil.java b/Mage.Sets/src/mage/cards/g/GlisteningOil.java index 593d746dd35..fe896a86edd 100644 --- a/Mage.Sets/src/mage/cards/g/GlisteningOil.java +++ b/Mage.Sets/src/mage/cards/g/GlisteningOil.java @@ -36,7 +36,7 @@ public final class GlisteningOil extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has infect. @@ -86,4 +86,4 @@ class GlisteningOilEffect extends OneShotEffect { return new GlisteningOilEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GlitteringFrost.java b/Mage.Sets/src/mage/cards/g/GlitteringFrost.java index 57c5690378e..4f87d0646ca 100644 --- a/Mage.Sets/src/mage/cards/g/GlitteringFrost.java +++ b/Mage.Sets/src/mage/cards/g/GlitteringFrost.java @@ -30,7 +30,7 @@ public final class GlitteringFrost extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is snow. diff --git a/Mage.Sets/src/mage/cards/g/GoblinCaves.java b/Mage.Sets/src/mage/cards/g/GoblinCaves.java index d7bd5df4cf5..1c859a70a97 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinCaves.java +++ b/Mage.Sets/src/mage/cards/g/GoblinCaves.java @@ -33,7 +33,7 @@ public final class GoblinCaves extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted land is a basic Mountain, Goblin creatures get +0/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostAllEffect(0, 2, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURE_GOBLINS, false), diff --git a/Mage.Sets/src/mage/cards/g/GoblinShrine.java b/Mage.Sets/src/mage/cards/g/GoblinShrine.java index ff992ab47bf..ffac8e9b6e6 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinShrine.java +++ b/Mage.Sets/src/mage/cards/g/GoblinShrine.java @@ -47,7 +47,7 @@ public final class GoblinShrine extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted land is a basic Mountain, Goblin creatures get +1/+0. diff --git a/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java b/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java index 1c0447d9ff1..9a519c6e557 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java +++ b/Mage.Sets/src/mage/cards/g/GoblinWarPaint.java @@ -35,7 +35,7 @@ public final class GoblinWarPaint extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has haste. diff --git a/Mage.Sets/src/mage/cards/g/GraftedGrowth.java b/Mage.Sets/src/mage/cards/g/GraftedGrowth.java index 892d2f595bd..cd1c7924aa8 100644 --- a/Mage.Sets/src/mage/cards/g/GraftedGrowth.java +++ b/Mage.Sets/src/mage/cards/g/GraftedGrowth.java @@ -46,7 +46,7 @@ public final class GraftedGrowth extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Grafted Growth enters the battlefield, put a +1/+1 counter on target creature or Vehicle you control. Ability ability = new EntersBattlefieldTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/g/GraftedIdentity.java b/Mage.Sets/src/mage/cards/g/GraftedIdentity.java index 53a8824c60b..1347d0ffd27 100644 --- a/Mage.Sets/src/mage/cards/g/GraftedIdentity.java +++ b/Mage.Sets/src/mage/cards/g/GraftedIdentity.java @@ -38,7 +38,7 @@ public final class GraftedIdentity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/g/GraniteGrip.java b/Mage.Sets/src/mage/cards/g/GraniteGrip.java index 055b70c44d9..2a8b91b6b4d 100644 --- a/Mage.Sets/src/mage/cards/g/GraniteGrip.java +++ b/Mage.Sets/src/mage/cards/g/GraniteGrip.java @@ -36,7 +36,7 @@ public final class GraniteGrip extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+0 for each Mountain you control. SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java b/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java index 8c549988d5f..e00a565219b 100644 --- a/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java +++ b/Mage.Sets/src/mage/cards/g/GraspOfTheHieromancer.java @@ -40,7 +40,7 @@ public final class GraspOfTheHieromancer extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has "Whenever this creature attacks, tap target creature defending player controls." diff --git a/Mage.Sets/src/mage/cards/g/GraveServitude.java b/Mage.Sets/src/mage/cards/g/GraveServitude.java index 5a7db798489..b11f85a0f9d 100644 --- a/Mage.Sets/src/mage/cards/g/GraveServitude.java +++ b/Mage.Sets/src/mage/cards/g/GraveServitude.java @@ -35,7 +35,7 @@ public final class GraveServitude extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/-1 and is black. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/g/GreelsCaress.java b/Mage.Sets/src/mage/cards/g/GreelsCaress.java index bfe47b8395b..9e87d8b2f61 100644 --- a/Mage.Sets/src/mage/cards/g/GreelsCaress.java +++ b/Mage.Sets/src/mage/cards/g/GreelsCaress.java @@ -34,7 +34,7 @@ public final class GreelsCaress extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/g/GreenScarab.java b/Mage.Sets/src/mage/cards/g/GreenScarab.java index a72f8bc3ac1..af034eb068a 100644 --- a/Mage.Sets/src/mage/cards/g/GreenScarab.java +++ b/Mage.Sets/src/mage/cards/g/GreenScarab.java @@ -43,7 +43,7 @@ public final class GreenScarab extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked by green creatures. diff --git a/Mage.Sets/src/mage/cards/g/GreenWard.java b/Mage.Sets/src/mage/cards/g/GreenWard.java index ecbd3d18eea..245e931e66d 100644 --- a/Mage.Sets/src/mage/cards/g/GreenWard.java +++ b/Mage.Sets/src/mage/cards/g/GreenWard.java @@ -30,7 +30,7 @@ public final class GreenWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has protection from green. This effect doesn't remove Green Ward. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/g/GremlinInfestation.java b/Mage.Sets/src/mage/cards/g/GremlinInfestation.java index d0b7af76ebb..658309b58bf 100644 --- a/Mage.Sets/src/mage/cards/g/GremlinInfestation.java +++ b/Mage.Sets/src/mage/cards/g/GremlinInfestation.java @@ -35,7 +35,7 @@ public final class GremlinInfestation extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Damage)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your end step, Gremlin Infestation deals 2 damage to enchanted artifact's controller. diff --git a/Mage.Sets/src/mage/cards/g/GriffinGuide.java b/Mage.Sets/src/mage/cards/g/GriffinGuide.java index f6cdb2ea84b..fc4d04ac44b 100644 --- a/Mage.Sets/src/mage/cards/g/GriffinGuide.java +++ b/Mage.Sets/src/mage/cards/g/GriffinGuide.java @@ -31,7 +31,7 @@ public final class GriffinGuide extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. diff --git a/Mage.Sets/src/mage/cards/g/GrislyTransformation.java b/Mage.Sets/src/mage/cards/g/GrislyTransformation.java index d05950e3e18..99beeebbcac 100644 --- a/Mage.Sets/src/mage/cards/g/GrislyTransformation.java +++ b/Mage.Sets/src/mage/cards/g/GrislyTransformation.java @@ -31,7 +31,7 @@ public final class GrislyTransformation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Grisly Transformation enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/g/Grounded.java b/Mage.Sets/src/mage/cards/g/Grounded.java index 0dd7abf1448..ef140d8d470 100644 --- a/Mage.Sets/src/mage/cards/g/Grounded.java +++ b/Mage.Sets/src/mage/cards/g/Grounded.java @@ -32,7 +32,7 @@ public final class Grounded extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature loses flying. diff --git a/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java b/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java index 6be7383e4f7..952b8959774 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeDeformity.java @@ -30,10 +30,10 @@ public final class GruesomeDeformity extends CardImpl { // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(); - this.getSpellAbility().addTarget(target); + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(target.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has intimidate. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(IntimidateAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/g/GryffsBoon.java b/Mage.Sets/src/mage/cards/g/GryffsBoon.java index cdbe31b9c5e..72836d2e8f0 100644 --- a/Mage.Sets/src/mage/cards/g/GryffsBoon.java +++ b/Mage.Sets/src/mage/cards/g/GryffsBoon.java @@ -36,7 +36,7 @@ public final class GryffsBoon extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0 and has flying. diff --git a/Mage.Sets/src/mage/cards/g/GuardDuty.java b/Mage.Sets/src/mage/cards/g/GuardDuty.java index e131db7d42a..e1ec95a710b 100644 --- a/Mage.Sets/src/mage/cards/g/GuardDuty.java +++ b/Mage.Sets/src/mage/cards/g/GuardDuty.java @@ -33,7 +33,7 @@ public final class GuardDuty extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DefenderAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java index 65b69f4c033..3fa7d2ff977 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianZendikon.java +++ b/Mage.Sets/src/mage/cards/g/GuardianZendikon.java @@ -40,7 +40,7 @@ public final class GuardianZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( @@ -79,4 +79,4 @@ class GuardianZendikonWallToken extends TokenImpl { public GuardianZendikonWallToken copy() { return new GuardianZendikonWallToken(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java index f937c1eaa5a..3e3cfce06c2 100644 --- a/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java +++ b/Mage.Sets/src/mage/cards/g/GuardiansMagemark.java @@ -38,7 +38,7 @@ public final class GuardiansMagemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1,1, Duration.WhileOnBattlefield, filter, false)); diff --git a/Mage.Sets/src/mage/cards/g/GuildscornWard.java b/Mage.Sets/src/mage/cards/g/GuildscornWard.java index c6b2218adcd..6770f8f7d0c 100644 --- a/Mage.Sets/src/mage/cards/g/GuildscornWard.java +++ b/Mage.Sets/src/mage/cards/g/GuildscornWard.java @@ -36,7 +36,7 @@ public final class GuildscornWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has protection from multicolored. diff --git a/Mage.Sets/src/mage/cards/g/GuiltyConscience.java b/Mage.Sets/src/mage/cards/g/GuiltyConscience.java index ee7e3cfdc93..b6f082df83a 100644 --- a/Mage.Sets/src/mage/cards/g/GuiltyConscience.java +++ b/Mage.Sets/src/mage/cards/g/GuiltyConscience.java @@ -31,7 +31,7 @@ public final class GuiltyConscience extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature deals damage, Guilty Conscience deals that much damage to that creature. diff --git a/Mage.Sets/src/mage/cards/g/GuiseOfFire.java b/Mage.Sets/src/mage/cards/g/GuiseOfFire.java index 2f543c31b3c..6cd72c40031 100644 --- a/Mage.Sets/src/mage/cards/g/GuiseOfFire.java +++ b/Mage.Sets/src/mage/cards/g/GuiseOfFire.java @@ -28,7 +28,7 @@ public final class GuiseOfFire extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/-1 and attacks each turn if able. diff --git a/Mage.Sets/src/mage/cards/g/GutterShortcut.java b/Mage.Sets/src/mage/cards/g/GutterShortcut.java index 5b2f62cf08d..179bfeb8eb2 100644 --- a/Mage.Sets/src/mage/cards/g/GutterShortcut.java +++ b/Mage.Sets/src/mage/cards/g/GutterShortcut.java @@ -38,7 +38,7 @@ public final class GutterShortcut extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked as long as it's attacking alone. @@ -70,4 +70,4 @@ enum GutterShortcutCondition implements Condition { return permanent != null && game.getCombat().attacksAlone() && game.getCombat().getAttackers().contains(permanent.getAttachedTo()); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/h/Hammerhand.java b/Mage.Sets/src/mage/cards/h/Hammerhand.java index 0f572f88035..e95626f7c9a 100644 --- a/Mage.Sets/src/mage/cards/h/Hammerhand.java +++ b/Mage.Sets/src/mage/cards/h/Hammerhand.java @@ -38,7 +38,7 @@ public final class Hammerhand extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Hammerhand enters the battlefield, target creature can't block this turn. diff --git a/Mage.Sets/src/mage/cards/h/HardCover.java b/Mage.Sets/src/mage/cards/h/HardCover.java index 64a6e762223..e86b8eeeca9 100644 --- a/Mage.Sets/src/mage/cards/h/HardCover.java +++ b/Mage.Sets/src/mage/cards/h/HardCover.java @@ -34,7 +34,7 @@ public final class HardCover extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2 and has "{T}: Draw a card, then discard a card." diff --git a/Mage.Sets/src/mage/cards/h/HardenedScaleArmor.java b/Mage.Sets/src/mage/cards/h/HardenedScaleArmor.java index 6da98093ed3..627e2c63710 100644 --- a/Mage.Sets/src/mage/cards/h/HardenedScaleArmor.java +++ b/Mage.Sets/src/mage/cards/h/HardenedScaleArmor.java @@ -31,7 +31,7 @@ public final class HardenedScaleArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. diff --git a/Mage.Sets/src/mage/cards/h/HarmoniousEmergence.java b/Mage.Sets/src/mage/cards/h/HarmoniousEmergence.java index 6da9ed6861b..b8511014d50 100644 --- a/Mage.Sets/src/mage/cards/h/HarmoniousEmergence.java +++ b/Mage.Sets/src/mage/cards/h/HarmoniousEmergence.java @@ -40,7 +40,7 @@ public final class HarmoniousEmergence extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted land is a 4/5 green Spirit creature with vigilance and haste. It's still a land. this.addAbility(new SimpleStaticAbility(new BecomesCreatureAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/h/HeartOfLight.java b/Mage.Sets/src/mage/cards/h/HeartOfLight.java index 279686011e5..5b6c498d451 100644 --- a/Mage.Sets/src/mage/cards/h/HeartOfLight.java +++ b/Mage.Sets/src/mage/cards/h/HeartOfLight.java @@ -33,7 +33,7 @@ public final class HeartOfLight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Prevent all damage that would be dealt to and dealt by enchanted creature. diff --git a/Mage.Sets/src/mage/cards/h/HeliodsPunishment.java b/Mage.Sets/src/mage/cards/h/HeliodsPunishment.java index 443d6d0cfe4..6a470d76bb6 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodsPunishment.java +++ b/Mage.Sets/src/mage/cards/h/HeliodsPunishment.java @@ -36,7 +36,7 @@ public final class HeliodsPunishment extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Heliod's Punishment enters the battlefield with four task counters on it. diff --git a/Mage.Sets/src/mage/cards/h/HelmOfTheGhastlord.java b/Mage.Sets/src/mage/cards/h/HelmOfTheGhastlord.java index 33d04e51d45..80f07922d3b 100644 --- a/Mage.Sets/src/mage/cards/h/HelmOfTheGhastlord.java +++ b/Mage.Sets/src/mage/cards/h/HelmOfTheGhastlord.java @@ -39,7 +39,7 @@ public final class HelmOfTheGhastlord extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is blue, it gets +1/+1 and has "Whenever this creature deals damage to an opponent, draw a card." SimpleStaticAbility blueAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.BLUE), "As long as enchanted creature is blue, it gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/h/HermeticStudy.java b/Mage.Sets/src/mage/cards/h/HermeticStudy.java index 7604d2e630c..5e7a1a5bd9e 100644 --- a/Mage.Sets/src/mage/cards/h/HermeticStudy.java +++ b/Mage.Sets/src/mage/cards/h/HermeticStudy.java @@ -35,7 +35,7 @@ public final class HermeticStudy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to any target." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/h/HeroicDefiance.java b/Mage.Sets/src/mage/cards/h/HeroicDefiance.java index b67f5643572..7d4afa9be20 100644 --- a/Mage.Sets/src/mage/cards/h/HeroicDefiance.java +++ b/Mage.Sets/src/mage/cards/h/HeroicDefiance.java @@ -37,7 +37,7 @@ public final class HeroicDefiance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 unless it shares a color with the most common color among all permanents or a color tied for most common. diff --git a/Mage.Sets/src/mage/cards/h/HerosResolve.java b/Mage.Sets/src/mage/cards/h/HerosResolve.java index da2d7a1bac0..409be046ac6 100644 --- a/Mage.Sets/src/mage/cards/h/HerosResolve.java +++ b/Mage.Sets/src/mage/cards/h/HerosResolve.java @@ -26,7 +26,7 @@ public final class HerosResolve extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 5, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/h/HistoriansWisdom.java b/Mage.Sets/src/mage/cards/h/HistoriansWisdom.java index 263e8b5bd6b..0f5668b911a 100644 --- a/Mage.Sets/src/mage/cards/h/HistoriansWisdom.java +++ b/Mage.Sets/src/mage/cards/h/HistoriansWisdom.java @@ -43,7 +43,7 @@ public final class HistoriansWisdom extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Historian's Wisdom enters the battlefield, if enchanted permanent is a creature with the greatest power among creatures on the battlefield, draw a card. this.addAbility(new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/h/Hobble.java b/Mage.Sets/src/mage/cards/h/Hobble.java index 467d189a05d..c1c6865492b 100644 --- a/Mage.Sets/src/mage/cards/h/Hobble.java +++ b/Mage.Sets/src/mage/cards/h/Hobble.java @@ -38,7 +38,7 @@ public final class Hobble extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Hobble enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); diff --git a/Mage.Sets/src/mage/cards/h/HoldForRansom.java b/Mage.Sets/src/mage/cards/h/HoldForRansom.java index 512dd93aff9..6b83eaa7bcb 100644 --- a/Mage.Sets/src/mage/cards/h/HoldForRansom.java +++ b/Mage.Sets/src/mage/cards/h/HoldForRansom.java @@ -36,7 +36,7 @@ public final class HoldForRansom extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't attack or block and has "{7}: Hold for Ransom's controller sacrifices it and draws a card. Activate only as a sorcery." Ability ability = new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA)); diff --git a/Mage.Sets/src/mage/cards/h/HolyArmor.java b/Mage.Sets/src/mage/cards/h/HolyArmor.java index a435e90fd7e..31c9ffa6d54 100644 --- a/Mage.Sets/src/mage/cards/h/HolyArmor.java +++ b/Mage.Sets/src/mage/cards/h/HolyArmor.java @@ -35,12 +35,12 @@ public final class HolyArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); // {W}: Enchanted creature gets +0/+1 until end of turn. - Ability ability2 = new EnchantAbility(auraTarget.getTargetName()); + Ability ability2 = new EnchantAbility(auraTarget); this.addAbility(ability2); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.W))); } diff --git a/Mage.Sets/src/mage/cards/h/HolyMantle.java b/Mage.Sets/src/mage/cards/h/HolyMantle.java index 4e5c729d7a6..1d2b3f47d17 100644 --- a/Mage.Sets/src/mage/cards/h/HolyMantle.java +++ b/Mage.Sets/src/mage/cards/h/HolyMantle.java @@ -36,7 +36,7 @@ public final class HolyMantle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has protection from creatures. diff --git a/Mage.Sets/src/mage/cards/h/HolyStrength.java b/Mage.Sets/src/mage/cards/h/HolyStrength.java index 6af9f139cb4..e48a87fc51e 100644 --- a/Mage.Sets/src/mage/cards/h/HolyStrength.java +++ b/Mage.Sets/src/mage/cards/h/HolyStrength.java @@ -32,7 +32,7 @@ public final class HolyStrength extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/h/HopeAgainstHope.java b/Mage.Sets/src/mage/cards/h/HopeAgainstHope.java index 5d825433e81..fcb418eb72a 100644 --- a/Mage.Sets/src/mage/cards/h/HopeAgainstHope.java +++ b/Mage.Sets/src/mage/cards/h/HopeAgainstHope.java @@ -32,7 +32,7 @@ public final class HopeAgainstHope extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1 for each creature you control. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent(), 1); diff --git a/Mage.Sets/src/mage/cards/h/HostileRealm.java b/Mage.Sets/src/mage/cards/h/HostileRealm.java index 9fa5ed9a09b..973a0c8ead1 100644 --- a/Mage.Sets/src/mage/cards/h/HostileRealm.java +++ b/Mage.Sets/src/mage/cards/h/HostileRealm.java @@ -37,7 +37,7 @@ public final class HostileRealm extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Target creature can't block this turn." diff --git a/Mage.Sets/src/mage/cards/h/HotSprings.java b/Mage.Sets/src/mage/cards/h/HotSprings.java index 09ad1280731..20173df89ef 100644 --- a/Mage.Sets/src/mage/cards/h/HotSprings.java +++ b/Mage.Sets/src/mage/cards/h/HotSprings.java @@ -37,7 +37,7 @@ public final class HotSprings extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(new FilterControlledLandPermanent()); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: Prevent the next 1 damage that would be dealt to any target this turn." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/h/HowlOfTheHunt.java b/Mage.Sets/src/mage/cards/h/HowlOfTheHunt.java index e11626d675f..0031d0efe98 100644 --- a/Mage.Sets/src/mage/cards/h/HowlOfTheHunt.java +++ b/Mage.Sets/src/mage/cards/h/HowlOfTheHunt.java @@ -39,7 +39,7 @@ public final class HowlOfTheHunt extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Howl of the Hunt enters the battlefield, if enchanted creature is a Wolf or Werewolf, untap that creature. diff --git a/Mage.Sets/src/mage/cards/h/HydrasGrowth.java b/Mage.Sets/src/mage/cards/h/HydrasGrowth.java index b539b68e7aa..616ecc61329 100644 --- a/Mage.Sets/src/mage/cards/h/HydrasGrowth.java +++ b/Mage.Sets/src/mage/cards/h/HydrasGrowth.java @@ -35,7 +35,7 @@ public final class HydrasGrowth extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Hydra's Growth enters the battlefield, put a +1/+1 counter on enchanted creature. diff --git a/Mage.Sets/src/mage/cards/h/HyenaUmbra.java b/Mage.Sets/src/mage/cards/h/HyenaUmbra.java index f85d2b92bb8..2a9adc4d0d8 100644 --- a/Mage.Sets/src/mage/cards/h/HyenaUmbra.java +++ b/Mage.Sets/src/mage/cards/h/HyenaUmbra.java @@ -29,7 +29,7 @@ public final class HyenaUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1 and has first strike. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java index ac1b58fb764..5b95dc323d6 100644 --- a/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java +++ b/Mage.Sets/src/mage/cards/h/HypervoltGrasp.java @@ -35,7 +35,7 @@ public final class HypervoltGrasp extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Tap: This creature deals 1 damage to any target." diff --git a/Mage.Sets/src/mage/cards/i/IceCage.java b/Mage.Sets/src/mage/cards/i/IceCage.java index 2de7423b090..11a3d50b4d8 100644 --- a/Mage.Sets/src/mage/cards/i/IceCage.java +++ b/Mage.Sets/src/mage/cards/i/IceCage.java @@ -30,7 +30,7 @@ public final class IceCage extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't attack or block, and its activated abilities can't be activated. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect())); diff --git a/Mage.Sets/src/mage/cards/i/IceOver.java b/Mage.Sets/src/mage/cards/i/IceOver.java index 513064c8561..5919fc5cc33 100644 --- a/Mage.Sets/src/mage/cards/i/IceOver.java +++ b/Mage.Sets/src/mage/cards/i/IceOver.java @@ -31,7 +31,7 @@ public final class IceOver extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/i/Ichthyomorphosis.java b/Mage.Sets/src/mage/cards/i/Ichthyomorphosis.java index 37493941782..f73d379c5dc 100644 --- a/Mage.Sets/src/mage/cards/i/Ichthyomorphosis.java +++ b/Mage.Sets/src/mage/cards/i/Ichthyomorphosis.java @@ -32,7 +32,7 @@ public final class Ichthyomorphosis extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature loses all abilities and is a blue Fish with base power and toughness 0/1. diff --git a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java index e0f47bfc0e2..b1f3aa18e53 100644 --- a/Mage.Sets/src/mage/cards/i/IlluminatedWings.java +++ b/Mage.Sets/src/mage/cards/i/IlluminatedWings.java @@ -36,7 +36,7 @@ public final class IlluminatedWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java b/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java index 3385a60d8de..d749d5f2f88 100644 --- a/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java +++ b/Mage.Sets/src/mage/cards/i/IllusionaryArmor.java @@ -33,7 +33,7 @@ public final class IllusionaryArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +4/+4. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(4, 4, Duration.WhileOnBattlefield))); // When enchanted creature becomes the target of a spell or ability, sacrifice Illusionary Armor. diff --git a/Mage.Sets/src/mage/cards/i/IllusoryGains.java b/Mage.Sets/src/mage/cards/i/IllusoryGains.java index dfb5afd2d33..61b43a3f49d 100644 --- a/Mage.Sets/src/mage/cards/i/IllusoryGains.java +++ b/Mage.Sets/src/mage/cards/i/IllusoryGains.java @@ -45,7 +45,7 @@ public final class IllusoryGains extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java b/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java index 6aa2de513c6..957969541b2 100644 --- a/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java +++ b/Mage.Sets/src/mage/cards/i/IllusoryWrappings.java @@ -31,7 +31,7 @@ public final class IllusoryWrappings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has base power and toughness 0/2. diff --git a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java index 25c42ce6d58..29a3fb6ee55 100644 --- a/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java +++ b/Mage.Sets/src/mage/cards/i/ImmobilizingInk.java @@ -39,7 +39,7 @@ public final class ImmobilizingInk extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/i/Immolation.java b/Mage.Sets/src/mage/cards/i/Immolation.java index e85d9917747..f78a7160f11 100644 --- a/Mage.Sets/src/mage/cards/i/Immolation.java +++ b/Mage.Sets/src/mage/cards/i/Immolation.java @@ -30,7 +30,7 @@ public final class Immolation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/-2. diff --git a/Mage.Sets/src/mage/cards/i/ImpendingDoom.java b/Mage.Sets/src/mage/cards/i/ImpendingDoom.java index 208dc46983e..42bb1a93a92 100644 --- a/Mage.Sets/src/mage/cards/i/ImpendingDoom.java +++ b/Mage.Sets/src/mage/cards/i/ImpendingDoom.java @@ -36,7 +36,7 @@ public final class ImpendingDoom extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and attacks each combat if able. diff --git a/Mage.Sets/src/mage/cards/i/ImposingVisage.java b/Mage.Sets/src/mage/cards/i/ImposingVisage.java index 426dc07c1fd..b476eeb2145 100644 --- a/Mage.Sets/src/mage/cards/i/ImposingVisage.java +++ b/Mage.Sets/src/mage/cards/i/ImposingVisage.java @@ -33,7 +33,7 @@ public final class ImposingVisage extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has menace. (It can't be blocked except by two or more creatures.) diff --git a/Mage.Sets/src/mage/cards/i/Imprison.java b/Mage.Sets/src/mage/cards/i/Imprison.java index c4f50a02409..fb335f4577d 100644 --- a/Mage.Sets/src/mage/cards/i/Imprison.java +++ b/Mage.Sets/src/mage/cards/i/Imprison.java @@ -43,7 +43,7 @@ public final class Imprison extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever a player activates an ability of enchanted creature with {T} in its activation cost that isn't a mana ability, you may pay {1}. If you do, counter that ability. If you don't, destroy Imprison. diff --git a/Mage.Sets/src/mage/cards/i/ImprisonedInTheMoon.java b/Mage.Sets/src/mage/cards/i/ImprisonedInTheMoon.java index 85e73d1adf2..f501e911c3f 100644 --- a/Mage.Sets/src/mage/cards/i/ImprisonedInTheMoon.java +++ b/Mage.Sets/src/mage/cards/i/ImprisonedInTheMoon.java @@ -40,7 +40,7 @@ public final class ImprisonedInTheMoon extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent is a colorless land with "{T}: Add {C}" and loses all other card types and abilities. diff --git a/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java b/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java index 51997516949..5da684ea2d2 100644 --- a/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java +++ b/Mage.Sets/src/mage/cards/i/ImprovisedArmor.java @@ -33,7 +33,7 @@ public final class ImprovisedArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+5. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 5, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/i/InBolassClutches.java b/Mage.Sets/src/mage/cards/i/InBolassClutches.java index 7ce27371753..ffd96642e22 100644 --- a/Mage.Sets/src/mage/cards/i/InBolassClutches.java +++ b/Mage.Sets/src/mage/cards/i/InBolassClutches.java @@ -35,7 +35,7 @@ public final class InBolassClutches extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted permanent. diff --git a/Mage.Sets/src/mage/cards/i/InTooDeep.java b/Mage.Sets/src/mage/cards/i/InTooDeep.java index c1c14b4a725..7ff9552a319 100644 --- a/Mage.Sets/src/mage/cards/i/InTooDeep.java +++ b/Mage.Sets/src/mage/cards/i/InTooDeep.java @@ -45,7 +45,7 @@ public final class InTooDeep extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted permanent is a colorless Clue artifact with "{2}, Sacrifice this artifact: Draw a card" and loses all other abilities. this.addAbility(new SimpleStaticAbility(new BecomesCreatureAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/i/Incendiary.java b/Mage.Sets/src/mage/cards/i/Incendiary.java index 75f9fba6201..122eb010207 100644 --- a/Mage.Sets/src/mage/cards/i/Incendiary.java +++ b/Mage.Sets/src/mage/cards/i/Incendiary.java @@ -39,7 +39,7 @@ public final class Incendiary extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, you may put a fuse counter on Incendiary. diff --git a/Mage.Sets/src/mage/cards/i/Indestructibility.java b/Mage.Sets/src/mage/cards/i/Indestructibility.java index 7a91e6e81d9..ee88593a099 100644 --- a/Mage.Sets/src/mage/cards/i/Indestructibility.java +++ b/Mage.Sets/src/mage/cards/i/Indestructibility.java @@ -25,7 +25,7 @@ public final class Indestructibility extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted permanent is indestructible. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/i/IndomitableMight.java b/Mage.Sets/src/mage/cards/i/IndomitableMight.java index ca1edf506bf..096ea20724b 100644 --- a/Mage.Sets/src/mage/cards/i/IndomitableMight.java +++ b/Mage.Sets/src/mage/cards/i/IndomitableMight.java @@ -35,7 +35,7 @@ public final class IndomitableMight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. diff --git a/Mage.Sets/src/mage/cards/i/IndomitableWill.java b/Mage.Sets/src/mage/cards/i/IndomitableWill.java index b540b59b12b..4b792906ea9 100644 --- a/Mage.Sets/src/mage/cards/i/IndomitableWill.java +++ b/Mage.Sets/src/mage/cards/i/IndomitableWill.java @@ -30,7 +30,7 @@ public final class IndomitableWill extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/i/IndrikUmbra.java b/Mage.Sets/src/mage/cards/i/IndrikUmbra.java index 367e40f67bf..0a1c667dc7d 100644 --- a/Mage.Sets/src/mage/cards/i/IndrikUmbra.java +++ b/Mage.Sets/src/mage/cards/i/IndrikUmbra.java @@ -37,7 +37,7 @@ public final class IndrikUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +4/+4 and has first strike, and all creatures able to block it do so. diff --git a/Mage.Sets/src/mage/cards/i/InertiaBubble.java b/Mage.Sets/src/mage/cards/i/InertiaBubble.java index f85e5ab4017..a1886cff994 100644 --- a/Mage.Sets/src/mage/cards/i/InertiaBubble.java +++ b/Mage.Sets/src/mage/cards/i/InertiaBubble.java @@ -29,7 +29,7 @@ public final class InertiaBubble extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted artifact doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("artifact"))); } diff --git a/Mage.Sets/src/mage/cards/i/InevitableEnd.java b/Mage.Sets/src/mage/cards/i/InevitableEnd.java index 8d17f6ab009..04930e7ade1 100644 --- a/Mage.Sets/src/mage/cards/i/InevitableEnd.java +++ b/Mage.Sets/src/mage/cards/i/InevitableEnd.java @@ -31,7 +31,7 @@ public final class InevitableEnd extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect( new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "At the beginning of your upkeep, sacrifice a diff --git a/Mage.Sets/src/mage/cards/i/InfectiousBloodlust.java b/Mage.Sets/src/mage/cards/i/InfectiousBloodlust.java index edf4b74d744..d9c8d2c1ced 100644 --- a/Mage.Sets/src/mage/cards/i/InfectiousBloodlust.java +++ b/Mage.Sets/src/mage/cards/i/InfectiousBloodlust.java @@ -40,7 +40,7 @@ public final class InfectiousBloodlust extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1, has haste, and attacks each turn if able. diff --git a/Mage.Sets/src/mage/cards/i/InfectiousCurse.java b/Mage.Sets/src/mage/cards/i/InfectiousCurse.java index 1ed1ff50d5e..f13581006c1 100644 --- a/Mage.Sets/src/mage/cards/i/InfectiousCurse.java +++ b/Mage.Sets/src/mage/cards/i/InfectiousCurse.java @@ -38,7 +38,7 @@ public final class InfectiousCurse extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Damage)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Spells you cast that target enchanted player cost {1} less to cast. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new InfectiousCurseCostReductionEffect())); diff --git a/Mage.Sets/src/mage/cards/i/InfernalScarring.java b/Mage.Sets/src/mage/cards/i/InfernalScarring.java index aae55a1d34e..44c8587ac91 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalScarring.java +++ b/Mage.Sets/src/mage/cards/i/InfernalScarring.java @@ -36,7 +36,7 @@ public final class InfernalScarring extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0 and has "When this creature dies, draw a card." diff --git a/Mage.Sets/src/mage/cards/i/InfernoFist.java b/Mage.Sets/src/mage/cards/i/InfernoFist.java index 3f73456ac4d..99eb03aedcb 100644 --- a/Mage.Sets/src/mage/cards/i/InfernoFist.java +++ b/Mage.Sets/src/mage/cards/i/InfernoFist.java @@ -36,7 +36,7 @@ public final class InfernoFist extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0. diff --git a/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java b/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java index f97afd7e261..dab37828a5e 100644 --- a/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java +++ b/Mage.Sets/src/mage/cards/i/InfiltratorsMagemark.java @@ -42,7 +42,7 @@ public final class InfiltratorsMagemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1 and can't be blocked except by creatures with defender. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)); diff --git a/Mage.Sets/src/mage/cards/i/InfiniteAuthority.java b/Mage.Sets/src/mage/cards/i/InfiniteAuthority.java index a717ed29b1a..ac66c1c9418 100644 --- a/Mage.Sets/src/mage/cards/i/InfiniteAuthority.java +++ b/Mage.Sets/src/mage/cards/i/InfiniteAuthority.java @@ -40,7 +40,7 @@ public final class InfiniteAuthority extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature blocks or becomes blocked by a creature with toughness 3 or less, destroy the other creature at end of combat. At the beginning of the next end step, if that creature was destroyed this way, put a +1/+1 counter on the first creature. diff --git a/Mage.Sets/src/mage/cards/i/InfiniteReflection.java b/Mage.Sets/src/mage/cards/i/InfiniteReflection.java index 2dbd65415a2..382fd5296a6 100644 --- a/Mage.Sets/src/mage/cards/i/InfiniteReflection.java +++ b/Mage.Sets/src/mage/cards/i/InfiniteReflection.java @@ -43,7 +43,7 @@ public final class InfiniteReflection extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Copy)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Infinite Reflection enters the battlefield attached to a creature, each other nontoken creature you control becomes a copy of that creature. diff --git a/Mage.Sets/src/mage/cards/i/InnerDemon.java b/Mage.Sets/src/mage/cards/i/InnerDemon.java index 1d295bf298f..723869af361 100644 --- a/Mage.Sets/src/mage/cards/i/InnerDemon.java +++ b/Mage.Sets/src/mage/cards/i/InnerDemon.java @@ -47,7 +47,7 @@ public final class InnerDemon extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has flying, and is a Demon in addition to its other types. diff --git a/Mage.Sets/src/mage/cards/i/Insolence.java b/Mage.Sets/src/mage/cards/i/Insolence.java index 7c3cc3b73b8..6927d44c1fc 100644 --- a/Mage.Sets/src/mage/cards/i/Insolence.java +++ b/Mage.Sets/src/mage/cards/i/Insolence.java @@ -30,7 +30,7 @@ public final class Insolence extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature becomes tapped, Insolence deals 2 damage to that creature's controller. this.addAbility(new BecomesTappedAttachedTriggeredAbility(new DamageAttachedControllerEffect(2), "enchanted creature")); diff --git a/Mage.Sets/src/mage/cards/i/InstillEnergy.java b/Mage.Sets/src/mage/cards/i/InstillEnergy.java index 1e89a509f77..64f3903fb45 100644 --- a/Mage.Sets/src/mage/cards/i/InstillEnergy.java +++ b/Mage.Sets/src/mage/cards/i/InstillEnergy.java @@ -33,7 +33,7 @@ public final class InstillEnergy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can attack as though it had haste. diff --git a/Mage.Sets/src/mage/cards/i/InstillFuror.java b/Mage.Sets/src/mage/cards/i/InstillFuror.java index 8f8b5043810..31477705725 100644 --- a/Mage.Sets/src/mage/cards/i/InstillFuror.java +++ b/Mage.Sets/src/mage/cards/i/InstillFuror.java @@ -41,7 +41,7 @@ public final class InstillFuror extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "At the beginning of your end step, sacrifice this creature unless it attacked this turn." diff --git a/Mage.Sets/src/mage/cards/i/Insubordination.java b/Mage.Sets/src/mage/cards/i/Insubordination.java index d3bb1123ba3..531c5b72735 100644 --- a/Mage.Sets/src/mage/cards/i/Insubordination.java +++ b/Mage.Sets/src/mage/cards/i/Insubordination.java @@ -33,7 +33,7 @@ public final class Insubordination extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of the end step of enchanted creature's controller, Insubordination deals 2 damage to that player unless that creature attacked this turn. diff --git a/Mage.Sets/src/mage/cards/i/IntercessorsArrest.java b/Mage.Sets/src/mage/cards/i/IntercessorsArrest.java index f3c78031a52..0221ebaa97e 100644 --- a/Mage.Sets/src/mage/cards/i/IntercessorsArrest.java +++ b/Mage.Sets/src/mage/cards/i/IntercessorsArrest.java @@ -31,7 +31,7 @@ public final class IntercessorsArrest extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted permanent can't attack, block, or crew Vehicles. Its activated abilities can't be activated unless they're mana abilities. Ability ability = new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA) diff --git a/Mage.Sets/src/mage/cards/i/Inviolability.java b/Mage.Sets/src/mage/cards/i/Inviolability.java index 5370264b262..fd31fb28a8f 100644 --- a/Mage.Sets/src/mage/cards/i/Inviolability.java +++ b/Mage.Sets/src/mage/cards/i/Inviolability.java @@ -25,7 +25,7 @@ public final class Inviolability extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Prevent all damage that would be dealt to enchanted creature. this.addAbility(new SimpleStaticAbility(new PreventDamageToAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/i/Invisibility.java b/Mage.Sets/src/mage/cards/i/Invisibility.java index 8356169c7ae..065019fdd3b 100644 --- a/Mage.Sets/src/mage/cards/i/Invisibility.java +++ b/Mage.Sets/src/mage/cards/i/Invisibility.java @@ -34,7 +34,7 @@ public final class Invisibility extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked except by Walls. diff --git a/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java b/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java index 48ccbac6d1a..21b72c7add1 100644 --- a/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java +++ b/Mage.Sets/src/mage/cards/i/InvocationOfSaintTraft.java @@ -37,7 +37,7 @@ public final class InvocationOfSaintTraft extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever this creature attacks, create a 4/4 white Angel creature token with flying tapped diff --git a/Mage.Sets/src/mage/cards/i/IonasBlessing.java b/Mage.Sets/src/mage/cards/i/IonasBlessing.java index 78e77012a08..727da83f17a 100644 --- a/Mage.Sets/src/mage/cards/i/IonasBlessing.java +++ b/Mage.Sets/src/mage/cards/i/IonasBlessing.java @@ -40,7 +40,7 @@ public final class IonasBlessing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has vigilance, and can block an additional creature. diff --git a/Mage.Sets/src/mage/cards/i/IroassBlessing.java b/Mage.Sets/src/mage/cards/i/IroassBlessing.java index b0847e2977b..689110ed3df 100644 --- a/Mage.Sets/src/mage/cards/i/IroassBlessing.java +++ b/Mage.Sets/src/mage/cards/i/IroassBlessing.java @@ -41,7 +41,7 @@ public final class IroassBlessing extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Iroas's Blessing enters the battlefield, it deals 4 damage to target creature or planeswalker an opponent controls. diff --git a/Mage.Sets/src/mage/cards/i/IronclawCurse.java b/Mage.Sets/src/mage/cards/i/IronclawCurse.java index 740d0fdb30f..678d5736c4b 100644 --- a/Mage.Sets/src/mage/cards/i/IronclawCurse.java +++ b/Mage.Sets/src/mage/cards/i/IronclawCurse.java @@ -29,7 +29,7 @@ public final class IronclawCurse extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets 0/-1. diff --git a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java index c5f0071dd8b..953f11ba23d 100644 --- a/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java +++ b/Mage.Sets/src/mage/cards/j/JeskaiRunemark.java @@ -46,7 +46,7 @@ public final class JeskaiRunemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/j/JolraelsFavor.java b/Mage.Sets/src/mage/cards/j/JolraelsFavor.java index 349172e7a32..e5cc444361f 100644 --- a/Mage.Sets/src/mage/cards/j/JolraelsFavor.java +++ b/Mage.Sets/src/mage/cards/j/JolraelsFavor.java @@ -35,7 +35,7 @@ public final class JolraelsFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {1}{G}: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{1}{G}"))); diff --git a/Mage.Sets/src/mage/cards/j/JourneyToEternity.java b/Mage.Sets/src/mage/cards/j/JourneyToEternity.java index cb54bb7b777..aeb1ea647d7 100644 --- a/Mage.Sets/src/mage/cards/j/JourneyToEternity.java +++ b/Mage.Sets/src/mage/cards/j/JourneyToEternity.java @@ -40,7 +40,7 @@ public final class JourneyToEternity extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_CREATURE_CONTROLLED); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, return it to the battlefield under your control, then return Journey to Eternity to the battlefield transformed under your control. diff --git a/Mage.Sets/src/mage/cards/k/KagemarosClutch.java b/Mage.Sets/src/mage/cards/k/KagemarosClutch.java index 03d4b307b83..ab569040113 100644 --- a/Mage.Sets/src/mage/cards/k/KagemarosClutch.java +++ b/Mage.Sets/src/mage/cards/k/KagemarosClutch.java @@ -36,7 +36,7 @@ public final class KagemarosClutch extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -X/-X, where X is the number of cards in your hand. diff --git a/Mage.Sets/src/mage/cards/k/KamahlsDesire.java b/Mage.Sets/src/mage/cards/k/KamahlsDesire.java index 82b00e974bc..d269afccdc3 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlsDesire.java +++ b/Mage.Sets/src/mage/cards/k/KamahlsDesire.java @@ -38,7 +38,7 @@ public final class KamahlsDesire extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has first strike. diff --git a/Mage.Sets/src/mage/cards/k/KarametrasFavor.java b/Mage.Sets/src/mage/cards/k/KarametrasFavor.java index 5a2385ca635..eefdd4bf9cc 100644 --- a/Mage.Sets/src/mage/cards/k/KarametrasFavor.java +++ b/Mage.Sets/src/mage/cards/k/KarametrasFavor.java @@ -37,7 +37,7 @@ public final class KarametrasFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Karametra's Favor enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/k/KasminasTransmutation.java b/Mage.Sets/src/mage/cards/k/KasminasTransmutation.java index 52885914331..5da9ec4ae3c 100644 --- a/Mage.Sets/src/mage/cards/k/KasminasTransmutation.java +++ b/Mage.Sets/src/mage/cards/k/KasminasTransmutation.java @@ -32,7 +32,7 @@ public final class KasminasTransmutation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature loses all abilities and has base power and toughness 1/1. diff --git a/Mage.Sets/src/mage/cards/k/KatildasRisingDawn.java b/Mage.Sets/src/mage/cards/k/KatildasRisingDawn.java index eaeb8cf2566..aee736ef256 100644 --- a/Mage.Sets/src/mage/cards/k/KatildasRisingDawn.java +++ b/Mage.Sets/src/mage/cards/k/KatildasRisingDawn.java @@ -58,7 +58,7 @@ public final class KatildasRisingDawn extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has flying, lifelink, and protection from Vampires, and it gets +X/+X where X is the number of permanents you control that are Spirits and/or enchantments. Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/k/KayasGhostform.java b/Mage.Sets/src/mage/cards/k/KayasGhostform.java index f9f39df10c9..0cd641eb58c 100644 --- a/Mage.Sets/src/mage/cards/k/KayasGhostform.java +++ b/Mage.Sets/src/mage/cards/k/KayasGhostform.java @@ -39,7 +39,7 @@ public final class KayasGhostform extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted permanent dies or is put into exile, return that card to the battlefield under your control. @@ -110,4 +110,4 @@ class KayasGhostformTriggeredAbility extends TriggeredAbilityImpl { return "When enchanted permanent dies or is put into exile, " + "return that card to the battlefield under your control."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KeenSense.java b/Mage.Sets/src/mage/cards/k/KeenSense.java index 4fc79327956..d6c10b0bdbf 100644 --- a/Mage.Sets/src/mage/cards/k/KeenSense.java +++ b/Mage.Sets/src/mage/cards/k/KeenSense.java @@ -31,7 +31,7 @@ public final class KeenSense extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature deals damage to an opponent, you may draw a card. diff --git a/Mage.Sets/src/mage/cards/k/KeldonMantle.java b/Mage.Sets/src/mage/cards/k/KeldonMantle.java index 03f91ae2b61..a266d1d94b9 100644 --- a/Mage.Sets/src/mage/cards/k/KeldonMantle.java +++ b/Mage.Sets/src/mage/cards/k/KeldonMantle.java @@ -36,7 +36,7 @@ public final class KeldonMantle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {B}: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{B}"))); diff --git a/Mage.Sets/src/mage/cards/k/KenrithsTransformation.java b/Mage.Sets/src/mage/cards/k/KenrithsTransformation.java index 800bc419d51..7d975e4398f 100644 --- a/Mage.Sets/src/mage/cards/k/KenrithsTransformation.java +++ b/Mage.Sets/src/mage/cards/k/KenrithsTransformation.java @@ -33,7 +33,7 @@ public final class KenrithsTransformation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Kenrith's Transformation enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/k/KirtarsDesire.java b/Mage.Sets/src/mage/cards/k/KirtarsDesire.java index 332991d6b07..4d83b319a5c 100644 --- a/Mage.Sets/src/mage/cards/k/KirtarsDesire.java +++ b/Mage.Sets/src/mage/cards/k/KirtarsDesire.java @@ -30,7 +30,7 @@ public final class KirtarsDesire extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. diff --git a/Mage.Sets/src/mage/cards/k/KithkinArmor.java b/Mage.Sets/src/mage/cards/k/KithkinArmor.java index 8dd7a95f1bc..941e304d1f8 100644 --- a/Mage.Sets/src/mage/cards/k/KithkinArmor.java +++ b/Mage.Sets/src/mage/cards/k/KithkinArmor.java @@ -40,7 +40,7 @@ public final class KithkinArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked by creatures with power 3 or greater. diff --git a/Mage.Sets/src/mage/cards/k/KjeldoranPride.java b/Mage.Sets/src/mage/cards/k/KjeldoranPride.java index 2b95248865d..27f47ff8b24 100644 --- a/Mage.Sets/src/mage/cards/k/KjeldoranPride.java +++ b/Mage.Sets/src/mage/cards/k/KjeldoranPride.java @@ -41,7 +41,7 @@ public final class KjeldoranPride extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability enchantAbility = new EnchantAbility(auraTarget.getTargetName()); + Ability enchantAbility = new EnchantAbility(auraTarget); this.addAbility(enchantAbility); // Enchanted creature gets +1/+2. diff --git a/Mage.Sets/src/mage/cards/k/KnightlyValor.java b/Mage.Sets/src/mage/cards/k/KnightlyValor.java index 064616a2dd7..afd2db7f5a3 100644 --- a/Mage.Sets/src/mage/cards/k/KnightlyValor.java +++ b/Mage.Sets/src/mage/cards/k/KnightlyValor.java @@ -40,7 +40,7 @@ public final class KnightlyValor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Knightly Valor enters the battlefield, create a 2/2 white Knight creature token with vigilance. diff --git a/Mage.Sets/src/mage/cards/k/KnightsPledge.java b/Mage.Sets/src/mage/cards/k/KnightsPledge.java index 1f08f88b980..9bf195075e8 100644 --- a/Mage.Sets/src/mage/cards/k/KnightsPledge.java +++ b/Mage.Sets/src/mage/cards/k/KnightsPledge.java @@ -31,7 +31,7 @@ public final class KnightsPledge extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/k/KrasisIncubation.java b/Mage.Sets/src/mage/cards/k/KrasisIncubation.java index d40ddb9dc69..f1aded7e177 100644 --- a/Mage.Sets/src/mage/cards/k/KrasisIncubation.java +++ b/Mage.Sets/src/mage/cards/k/KrasisIncubation.java @@ -35,7 +35,7 @@ public final class KrasisIncubation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseLife)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/k/KrovikanFetish.java b/Mage.Sets/src/mage/cards/k/KrovikanFetish.java index d40702b076c..edf0ce3395e 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanFetish.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanFetish.java @@ -35,7 +35,7 @@ public final class KrovikanFetish extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Krovikan Fetish enters the battlefield, draw a card at the beginning of the next turn's upkeep. diff --git a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java index 75eca64929b..c8f5e89894f 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanPlague.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanPlague.java @@ -56,7 +56,7 @@ public final class KrovikanPlague extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(filterNonWall); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Krovikan Plague enters the battlefield, draw a card at the beginning of the next turn's upkeep. diff --git a/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java b/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java index 737acde3370..23ab7e93a65 100644 --- a/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java +++ b/Mage.Sets/src/mage/cards/k/KrovikanWhispers.java @@ -38,7 +38,7 @@ public final class KrovikanWhispers extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Cumulative upkeep-Pay {U} or {B}. diff --git a/Mage.Sets/src/mage/cards/k/Kudzu.java b/Mage.Sets/src/mage/cards/k/Kudzu.java index 9c3745caf22..b77d788cfc1 100644 --- a/Mage.Sets/src/mage/cards/k/Kudzu.java +++ b/Mage.Sets/src/mage/cards/k/Kudzu.java @@ -35,7 +35,7 @@ public final class Kudzu extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted land becomes tapped, destroy it. That land's controller attaches Kudzu to a land of their choice. diff --git a/Mage.Sets/src/mage/cards/k/KumanosBlessing.java b/Mage.Sets/src/mage/cards/k/KumanosBlessing.java index e833259df2b..8e47a032a68 100644 --- a/Mage.Sets/src/mage/cards/k/KumanosBlessing.java +++ b/Mage.Sets/src/mage/cards/k/KumanosBlessing.java @@ -39,7 +39,7 @@ public final class KumanosBlessing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // If a creature dealt damage by enchanted creature this turn would die, exile it instead. diff --git a/Mage.Sets/src/mage/cards/l/LaccolithRig.java b/Mage.Sets/src/mage/cards/l/LaccolithRig.java index 56c4b189eda..c4bad247d21 100644 --- a/Mage.Sets/src/mage/cards/l/LaccolithRig.java +++ b/Mage.Sets/src/mage/cards/l/LaccolithRig.java @@ -30,7 +30,7 @@ public final class LaccolithRig extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature becomes blocked, you may have it deal damage equal to its power to target creature. // If you do, the first creature assigns no combat damage this turn. diff --git a/Mage.Sets/src/mage/cards/l/Lance.java b/Mage.Sets/src/mage/cards/l/Lance.java index ac41250f9e5..528f878d5e3 100644 --- a/Mage.Sets/src/mage/cards/l/Lance.java +++ b/Mage.Sets/src/mage/cards/l/Lance.java @@ -32,7 +32,7 @@ public final class Lance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has first strike. diff --git a/Mage.Sets/src/mage/cards/l/LanternsLift.java b/Mage.Sets/src/mage/cards/l/LanternsLift.java index 2ab3b0e1d03..f3a2a2f87d3 100644 --- a/Mage.Sets/src/mage/cards/l/LanternsLift.java +++ b/Mage.Sets/src/mage/cards/l/LanternsLift.java @@ -33,7 +33,7 @@ public final class LanternsLift extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying. diff --git a/Mage.Sets/src/mage/cards/l/Lashknife.java b/Mage.Sets/src/mage/cards/l/Lashknife.java index 1cf1d1b4fef..ba5adc8e2f9 100644 --- a/Mage.Sets/src/mage/cards/l/Lashknife.java +++ b/Mage.Sets/src/mage/cards/l/Lashknife.java @@ -51,7 +51,7 @@ public final class Lashknife extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has first strike. diff --git a/Mage.Sets/src/mage/cards/l/LatullasOrders.java b/Mage.Sets/src/mage/cards/l/LatullasOrders.java index 782f1a2a900..ceb835d00cf 100644 --- a/Mage.Sets/src/mage/cards/l/LatullasOrders.java +++ b/Mage.Sets/src/mage/cards/l/LatullasOrders.java @@ -41,7 +41,7 @@ public final class LatullasOrders extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature deals combat damage to defending player, you may destroy target artifact that player controls. this.addAbility(new LatullasOrdersTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/l/Launch.java b/Mage.Sets/src/mage/cards/l/Launch.java index 6f0f0996c1c..9238c767de1 100644 --- a/Mage.Sets/src/mage/cards/l/Launch.java +++ b/Mage.Sets/src/mage/cards/l/Launch.java @@ -27,7 +27,7 @@ public final class Launch extends CardImpl { TargetCreaturePermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/l/LavamancersSkill.java b/Mage.Sets/src/mage/cards/l/LavamancersSkill.java index 3e805f5c9e5..e3e35f56418 100644 --- a/Mage.Sets/src/mage/cards/l/LavamancersSkill.java +++ b/Mage.Sets/src/mage/cards/l/LavamancersSkill.java @@ -34,7 +34,7 @@ public final class LavamancersSkill extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to target creature." diff --git a/Mage.Sets/src/mage/cards/l/LawmagesBinding.java b/Mage.Sets/src/mage/cards/l/LawmagesBinding.java index f5d89ce8146..e7be08c88f9 100644 --- a/Mage.Sets/src/mage/cards/l/LawmagesBinding.java +++ b/Mage.Sets/src/mage/cards/l/LawmagesBinding.java @@ -34,7 +34,7 @@ public final class LawmagesBinding extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block, and its activate abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/l/LayClaim.java b/Mage.Sets/src/mage/cards/l/LayClaim.java index ccf96d255ea..81577f464d6 100644 --- a/Mage.Sets/src/mage/cards/l/LayClaim.java +++ b/Mage.Sets/src/mage/cards/l/LayClaim.java @@ -32,7 +32,7 @@ public final class LayClaim extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted permanent. diff --git a/Mage.Sets/src/mage/cards/l/LeadenFists.java b/Mage.Sets/src/mage/cards/l/LeadenFists.java index 6de5e3b08d5..804e33b49ec 100644 --- a/Mage.Sets/src/mage/cards/l/LeadenFists.java +++ b/Mage.Sets/src/mage/cards/l/LeadenFists.java @@ -37,7 +37,7 @@ public final class LeadenFists extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java index 4e0bea343e3..987ee235c5a 100644 --- a/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java +++ b/Mage.Sets/src/mage/cards/l/LeafdrakeRoost.java @@ -37,7 +37,7 @@ public final class LeafdrakeRoost extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{G}{U}, {tap}: Create a 2/2 green and blue Drake creature token with flying." diff --git a/Mage.Sets/src/mage/cards/l/LeshracsRite.java b/Mage.Sets/src/mage/cards/l/LeshracsRite.java index 5499c5043e8..dde906fe68f 100644 --- a/Mage.Sets/src/mage/cards/l/LeshracsRite.java +++ b/Mage.Sets/src/mage/cards/l/LeshracsRite.java @@ -33,7 +33,7 @@ public final class LeshracsRite extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has swampwalk. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SwampwalkAbility(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/l/Lifelink.java b/Mage.Sets/src/mage/cards/l/Lifelink.java index 5f47351da32..69a3d5f798e 100644 --- a/Mage.Sets/src/mage/cards/l/Lifelink.java +++ b/Mage.Sets/src/mage/cards/l/Lifelink.java @@ -28,7 +28,7 @@ public final class Lifelink extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/l/LightOfPromise.java b/Mage.Sets/src/mage/cards/l/LightOfPromise.java index 157b743bbd5..218fb31ec6a 100644 --- a/Mage.Sets/src/mage/cards/l/LightOfPromise.java +++ b/Mage.Sets/src/mage/cards/l/LightOfPromise.java @@ -36,7 +36,7 @@ public final class LightOfPromise extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever you gain life, put that many +1/+1 counters on this creature." diff --git a/Mage.Sets/src/mage/cards/l/LightningDiadem.java b/Mage.Sets/src/mage/cards/l/LightningDiadem.java index 2d4a312adbe..8d72627bbcc 100644 --- a/Mage.Sets/src/mage/cards/l/LightningDiadem.java +++ b/Mage.Sets/src/mage/cards/l/LightningDiadem.java @@ -35,7 +35,7 @@ public final class LightningDiadem extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Lightning Diadem enters the battlefield, it deals 2 damage to any target. diff --git a/Mage.Sets/src/mage/cards/l/LightningProwess.java b/Mage.Sets/src/mage/cards/l/LightningProwess.java index cb96b2db105..260bb9a1437 100644 --- a/Mage.Sets/src/mage/cards/l/LightningProwess.java +++ b/Mage.Sets/src/mage/cards/l/LightningProwess.java @@ -33,7 +33,7 @@ public final class LightningProwess extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has haste and "{tap}: This creature deals 1 damage to any target." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/l/LightningReflexes.java b/Mage.Sets/src/mage/cards/l/LightningReflexes.java index 38fc4179ec9..14c03640dd8 100644 --- a/Mage.Sets/src/mage/cards/l/LightningReflexes.java +++ b/Mage.Sets/src/mage/cards/l/LightningReflexes.java @@ -40,7 +40,7 @@ public final class LightningReflexes extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0 and has first strike. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/l/LightningTalons.java b/Mage.Sets/src/mage/cards/l/LightningTalons.java index aa4cce88ac4..e6dde22cd88 100644 --- a/Mage.Sets/src/mage/cards/l/LightningTalons.java +++ b/Mage.Sets/src/mage/cards/l/LightningTalons.java @@ -34,7 +34,7 @@ public final class LightningTalons extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); Effect effect2 = new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/l/Lignify.java b/Mage.Sets/src/mage/cards/l/Lignify.java index b6e70cf7cf0..c76c1af71e9 100644 --- a/Mage.Sets/src/mage/cards/l/Lignify.java +++ b/Mage.Sets/src/mage/cards/l/Lignify.java @@ -33,7 +33,7 @@ public final class Lignify extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature is a Treefolk with base power and toughness 0/4 and loses all abilities. diff --git a/Mage.Sets/src/mage/cards/l/LingeringDeath.java b/Mage.Sets/src/mage/cards/l/LingeringDeath.java index b23aeeb4a21..eac77497676 100644 --- a/Mage.Sets/src/mage/cards/l/LingeringDeath.java +++ b/Mage.Sets/src/mage/cards/l/LingeringDeath.java @@ -33,7 +33,7 @@ public final class LingeringDeath extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DestroyPermanent)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of the end step of enchanted creature's controller, that player sacrifices that creature. diff --git a/Mage.Sets/src/mage/cards/l/LingeringMirage.java b/Mage.Sets/src/mage/cards/l/LingeringMirage.java index 355951d1692..44870c1976b 100644 --- a/Mage.Sets/src/mage/cards/l/LingeringMirage.java +++ b/Mage.Sets/src/mage/cards/l/LingeringMirage.java @@ -34,7 +34,7 @@ public final class LingeringMirage extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is an Island. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.ISLAND))); diff --git a/Mage.Sets/src/mage/cards/l/LithoformBlight.java b/Mage.Sets/src/mage/cards/l/LithoformBlight.java index fa60da1cf24..a515b49989b 100644 --- a/Mage.Sets/src/mage/cards/l/LithoformBlight.java +++ b/Mage.Sets/src/mage/cards/l/LithoformBlight.java @@ -33,7 +33,7 @@ public final class LithoformBlight extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Lithoform Blight enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/l/LivingArtifact.java b/Mage.Sets/src/mage/cards/l/LivingArtifact.java index 185e1049172..240c7eaa32c 100644 --- a/Mage.Sets/src/mage/cards/l/LivingArtifact.java +++ b/Mage.Sets/src/mage/cards/l/LivingArtifact.java @@ -42,7 +42,7 @@ public final class LivingArtifact extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever you're dealt damage, put that many vitality counters on Living Artifact. this.addAbility(new LivingArtifactTriggeredAbility()); diff --git a/Mage.Sets/src/mage/cards/l/LivingTerrain.java b/Mage.Sets/src/mage/cards/l/LivingTerrain.java index 8b84946d7c6..9076fde2bcb 100644 --- a/Mage.Sets/src/mage/cards/l/LivingTerrain.java +++ b/Mage.Sets/src/mage/cards/l/LivingTerrain.java @@ -31,7 +31,7 @@ public final class LivingTerrain extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is a 5/6 green Treefolk creature that's still a land. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/l/LockedInTheCemetery.java b/Mage.Sets/src/mage/cards/l/LockedInTheCemetery.java index a292808439a..5464e12d019 100644 --- a/Mage.Sets/src/mage/cards/l/LockedInTheCemetery.java +++ b/Mage.Sets/src/mage/cards/l/LockedInTheCemetery.java @@ -36,7 +36,7 @@ public final class LockedInTheCemetery extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Locked in the Cemetery enters the battlefield, if there are five or more cards in your graveyard, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/l/LuminousBonds.java b/Mage.Sets/src/mage/cards/l/LuminousBonds.java index 4b02171c230..c7fd1a69ede 100644 --- a/Mage.Sets/src/mage/cards/l/LuminousBonds.java +++ b/Mage.Sets/src/mage/cards/l/LuminousBonds.java @@ -32,7 +32,7 @@ public final class LuminousBonds extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. diff --git a/Mage.Sets/src/mage/cards/l/LuminousWake.java b/Mage.Sets/src/mage/cards/l/LuminousWake.java index d1358ebcc73..0961aa934a5 100644 --- a/Mage.Sets/src/mage/cards/l/LuminousWake.java +++ b/Mage.Sets/src/mage/cards/l/LuminousWake.java @@ -28,7 +28,7 @@ public final class LuminousWake extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks or blocks, you gain 4 life. diff --git a/Mage.Sets/src/mage/cards/l/LunarchMantle.java b/Mage.Sets/src/mage/cards/l/LunarchMantle.java index f443b6ac774..6bb7a8473ee 100644 --- a/Mage.Sets/src/mage/cards/l/LunarchMantle.java +++ b/Mage.Sets/src/mage/cards/l/LunarchMantle.java @@ -41,7 +41,7 @@ public final class LunarchMantle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{1}, Sacrifice a permanent: This creature gains flying until end of turn." diff --git a/Mage.Sets/src/mage/cards/l/Lure.java b/Mage.Sets/src/mage/cards/l/Lure.java index d916c947ef2..87dfa111dae 100644 --- a/Mage.Sets/src/mage/cards/l/Lure.java +++ b/Mage.Sets/src/mage/cards/l/Lure.java @@ -33,7 +33,7 @@ public final class Lure extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // All creatures able to block enchanted creature do so. diff --git a/Mage.Sets/src/mage/cards/l/LushGrowth.java b/Mage.Sets/src/mage/cards/l/LushGrowth.java index 5f0defb29d4..1f3318f6114 100644 --- a/Mage.Sets/src/mage/cards/l/LushGrowth.java +++ b/Mage.Sets/src/mage/cards/l/LushGrowth.java @@ -31,7 +31,7 @@ public final class LushGrowth extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted land is a Mountain, Forest, and Plains. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.MOUNTAIN, SubType.FOREST, SubType.PLAINS))); diff --git a/Mage.Sets/src/mage/cards/l/LustForWar.java b/Mage.Sets/src/mage/cards/l/LustForWar.java index 437e927317c..afc7a796615 100644 --- a/Mage.Sets/src/mage/cards/l/LustForWar.java +++ b/Mage.Sets/src/mage/cards/l/LustForWar.java @@ -34,7 +34,7 @@ public final class LustForWar extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature becomes tapped, Lust for War deals 3 damage to that creature's controller. diff --git a/Mage.Sets/src/mage/cards/m/MadcapSkills.java b/Mage.Sets/src/mage/cards/m/MadcapSkills.java index c5cdde200a0..9e25c220b48 100644 --- a/Mage.Sets/src/mage/cards/m/MadcapSkills.java +++ b/Mage.Sets/src/mage/cards/m/MadcapSkills.java @@ -34,7 +34,7 @@ public final class MadcapSkills extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+0 and and has menace. (It can't be blocked except by two or more creatures.) diff --git a/Mage.Sets/src/mage/cards/m/MaddeningHex.java b/Mage.Sets/src/mage/cards/m/MaddeningHex.java index d1bf2ec0e8c..430315b6bdc 100644 --- a/Mage.Sets/src/mage/cards/m/MaddeningHex.java +++ b/Mage.Sets/src/mage/cards/m/MaddeningHex.java @@ -38,7 +38,7 @@ public final class MaddeningHex extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted player casts a noncreature spell, roll a d6. Maddening Hex deals damage to that player equal to the result. Then attach Maddening Hex to another one of your opponents chosen at random. diff --git a/Mage.Sets/src/mage/cards/m/MagefireWings.java b/Mage.Sets/src/mage/cards/m/MagefireWings.java index 6f56ccc17bc..8a9995ea9b9 100644 --- a/Mage.Sets/src/mage/cards/m/MagefireWings.java +++ b/Mage.Sets/src/mage/cards/m/MagefireWings.java @@ -27,7 +27,7 @@ public final class MagefireWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( 2, 0, Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/m/MagetasBoon.java b/Mage.Sets/src/mage/cards/m/MagetasBoon.java index f1fef4f5488..f2ca51046c8 100644 --- a/Mage.Sets/src/mage/cards/m/MagetasBoon.java +++ b/Mage.Sets/src/mage/cards/m/MagetasBoon.java @@ -34,7 +34,7 @@ public final class MagetasBoon extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/m/MaggotTherapy.java b/Mage.Sets/src/mage/cards/m/MaggotTherapy.java index 502ef1eb4b1..4d811b7ec61 100644 --- a/Mage.Sets/src/mage/cards/m/MaggotTherapy.java +++ b/Mage.Sets/src/mage/cards/m/MaggotTherapy.java @@ -31,7 +31,7 @@ public final class MaggotTherapy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/-2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/m/Malfunction.java b/Mage.Sets/src/mage/cards/m/Malfunction.java index 0c124b02ede..9315237a59d 100644 --- a/Mage.Sets/src/mage/cards/m/Malfunction.java +++ b/Mage.Sets/src/mage/cards/m/Malfunction.java @@ -40,7 +40,7 @@ public final class Malfunction extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Malfunction enters the battlefield, tap enchanted permanent. diff --git a/Mage.Sets/src/mage/cards/m/MaliciousIntent.java b/Mage.Sets/src/mage/cards/m/MaliciousIntent.java index bf90e1aea8b..eea51f29b1a 100644 --- a/Mage.Sets/src/mage/cards/m/MaliciousIntent.java +++ b/Mage.Sets/src/mage/cards/m/MaliciousIntent.java @@ -32,7 +32,7 @@ public final class MaliciousIntent extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: Target creature can't block this turn." diff --git a/Mage.Sets/src/mage/cards/m/MammothHarness.java b/Mage.Sets/src/mage/cards/m/MammothHarness.java index 636ca192783..348e4544ad5 100644 --- a/Mage.Sets/src/mage/cards/m/MammothHarness.java +++ b/Mage.Sets/src/mage/cards/m/MammothHarness.java @@ -34,7 +34,7 @@ public final class MammothHarness extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature loses flying. diff --git a/Mage.Sets/src/mage/cards/m/MammothUmbra.java b/Mage.Sets/src/mage/cards/m/MammothUmbra.java index ed7a4331739..e322a892d0d 100644 --- a/Mage.Sets/src/mage/cards/m/MammothUmbra.java +++ b/Mage.Sets/src/mage/cards/m/MammothUmbra.java @@ -29,7 +29,7 @@ public final class MammothUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3 and has vigilance. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/m/ManaChains.java b/Mage.Sets/src/mage/cards/m/ManaChains.java index 14ebe31340c..11c4436bd55 100644 --- a/Mage.Sets/src/mage/cards/m/ManaChains.java +++ b/Mage.Sets/src/mage/cards/m/ManaChains.java @@ -33,7 +33,7 @@ public final class ManaChains extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Cumulative upkeep {1}." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java b/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java index c4f3c8d88b5..0378c314f43 100644 --- a/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java +++ b/Mage.Sets/src/mage/cards/m/ManaclesOfDecay.java @@ -31,7 +31,7 @@ public final class ManaclesOfDecay extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. diff --git a/Mage.Sets/src/mage/cards/m/ManiacalRage.java b/Mage.Sets/src/mage/cards/m/ManiacalRage.java index b083748daaa..4cfb9309ba5 100644 --- a/Mage.Sets/src/mage/cards/m/ManiacalRage.java +++ b/Mage.Sets/src/mage/cards/m/ManiacalRage.java @@ -27,7 +27,7 @@ public final class ManiacalRage extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and can't block. diff --git a/Mage.Sets/src/mage/cards/m/MantleOfLeadership.java b/Mage.Sets/src/mage/cards/m/MantleOfLeadership.java index d188be76af1..6d5ea6a8b75 100644 --- a/Mage.Sets/src/mage/cards/m/MantleOfLeadership.java +++ b/Mage.Sets/src/mage/cards/m/MantleOfLeadership.java @@ -36,7 +36,7 @@ public final class MantleOfLeadership extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever a creature enters the battlefield, enchanted creature gets +2/+2 until end of turn. diff --git a/Mage.Sets/src/mage/cards/m/MantleOfTheAncients.java b/Mage.Sets/src/mage/cards/m/MantleOfTheAncients.java index 6c8cc3da6d6..7f41fa32cc8 100644 --- a/Mage.Sets/src/mage/cards/m/MantleOfTheAncients.java +++ b/Mage.Sets/src/mage/cards/m/MantleOfTheAncients.java @@ -41,7 +41,7 @@ public final class MantleOfTheAncients extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Mantle of the Ancients enters the battlefield, return any number of target Aura and/or Equipment cards from your graveyard to the battlefield attached to enchanted creature. diff --git a/Mage.Sets/src/mage/cards/m/MantleOfTheWolf.java b/Mage.Sets/src/mage/cards/m/MantleOfTheWolf.java index 506012be652..f8d4eba18df 100644 --- a/Mage.Sets/src/mage/cards/m/MantleOfTheWolf.java +++ b/Mage.Sets/src/mage/cards/m/MantleOfTheWolf.java @@ -32,7 +32,7 @@ public final class MantleOfTheWolf extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +4/+4. diff --git a/Mage.Sets/src/mage/cards/m/MantleOfWebs.java b/Mage.Sets/src/mage/cards/m/MantleOfWebs.java index 4a0e58a9b5f..e2e630128b7 100644 --- a/Mage.Sets/src/mage/cards/m/MantleOfWebs.java +++ b/Mage.Sets/src/mage/cards/m/MantleOfWebs.java @@ -35,7 +35,7 @@ public final class MantleOfWebs extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+3 and has reach. diff --git a/Mage.Sets/src/mage/cards/m/MarduRunemark.java b/Mage.Sets/src/mage/cards/m/MarduRunemark.java index 99803143904..55d21e07454 100644 --- a/Mage.Sets/src/mage/cards/m/MarduRunemark.java +++ b/Mage.Sets/src/mage/cards/m/MarduRunemark.java @@ -46,7 +46,7 @@ public final class MarduRunemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/m/MarkOfEviction.java b/Mage.Sets/src/mage/cards/m/MarkOfEviction.java index 4e591864381..aa191165f4b 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfEviction.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfEviction.java @@ -38,7 +38,7 @@ public final class MarkOfEviction extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, return enchanted creature and all Auras attached to that creature to their owners' hands. diff --git a/Mage.Sets/src/mage/cards/m/MarkOfFury.java b/Mage.Sets/src/mage/cards/m/MarkOfFury.java index 990f09c9240..9b6aaf4cf39 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfFury.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfFury.java @@ -35,7 +35,7 @@ public final class MarkOfFury extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has haste. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(HasteAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java b/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java index d37ec64ff88..5f389196a20 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfSakiko.java @@ -40,7 +40,7 @@ public final class MarkOfSakiko extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever this creature deals combat damage to a player, add that much {G}. Until end of turn, you don't lose this mana as steps and phases end." diff --git a/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java b/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java index 680a9931f60..22a70481b99 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfTheOni.java @@ -33,7 +33,7 @@ public final class MarkOfTheOni extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java b/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java index 30c4e6d613a..25951f46c22 100644 --- a/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java +++ b/Mage.Sets/src/mage/cards/m/MarkOfTheVampire.java @@ -31,10 +31,10 @@ public final class MarkOfTheVampire extends CardImpl { this.subtype.add(SubType.AURA); // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(); - this.getSpellAbility().addTarget(target); + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(target.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 and has lifelink. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/m/MarkedByHonor.java b/Mage.Sets/src/mage/cards/m/MarkedByHonor.java index 90ec6c14526..d01cdc7e9b4 100644 --- a/Mage.Sets/src/mage/cards/m/MarkedByHonor.java +++ b/Mage.Sets/src/mage/cards/m/MarkedByHonor.java @@ -36,7 +36,7 @@ public final class MarkedByHonor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has vigilance. diff --git a/Mage.Sets/src/mage/cards/m/MarketFestival.java b/Mage.Sets/src/mage/cards/m/MarketFestival.java index cfeb8de355c..c2c9baf25e0 100644 --- a/Mage.Sets/src/mage/cards/m/MarketFestival.java +++ b/Mage.Sets/src/mage/cards/m/MarketFestival.java @@ -35,7 +35,7 @@ public final class MarketFestival extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors (in addition to the mana the land produces). diff --git a/Mage.Sets/src/mage/cards/m/MartialImpetus.java b/Mage.Sets/src/mage/cards/m/MartialImpetus.java index 0516b0fae56..d3dcdd01591 100644 --- a/Mage.Sets/src/mage/cards/m/MartialImpetus.java +++ b/Mage.Sets/src/mage/cards/m/MartialImpetus.java @@ -41,7 +41,7 @@ public final class MartialImpetus extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and is goaded. diff --git a/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java b/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java index 6cb1501af15..80360c3817c 100644 --- a/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java +++ b/Mage.Sets/src/mage/cards/m/MaskOfLawAndGrace.java @@ -34,7 +34,7 @@ public final class MaskOfLawAndGrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has protection from black and from red. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED), diff --git a/Mage.Sets/src/mage/cards/m/MechanizedProduction.java b/Mage.Sets/src/mage/cards/m/MechanizedProduction.java index 7c67693d92c..11e530a8710 100644 --- a/Mage.Sets/src/mage/cards/m/MechanizedProduction.java +++ b/Mage.Sets/src/mage/cards/m/MechanizedProduction.java @@ -40,7 +40,7 @@ public final class MechanizedProduction extends CardImpl { TargetPermanent auraTarget = new TargetControlledPermanent(new FilterControlledArtifactPermanent()); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Copy)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, create a token that's a copy of enchanted artifact. Then if you control eight or more artifacts with the same name as one another, you win the game. diff --git a/Mage.Sets/src/mage/cards/m/Melancholy.java b/Mage.Sets/src/mage/cards/m/Melancholy.java index 47207107a7f..1550e6a734b 100644 --- a/Mage.Sets/src/mage/cards/m/Melancholy.java +++ b/Mage.Sets/src/mage/cards/m/Melancholy.java @@ -34,7 +34,7 @@ public final class Melancholy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Melancholy enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/m/Merseine.java b/Mage.Sets/src/mage/cards/m/Merseine.java index 4ffb0bc6b77..826f0253308 100644 --- a/Mage.Sets/src/mage/cards/m/Merseine.java +++ b/Mage.Sets/src/mage/cards/m/Merseine.java @@ -39,7 +39,7 @@ public final class Merseine extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Merseine enters the battlefield with three net counters on it. Effect effect = new AddCountersSourceEffect(CounterType.NET.createInstance(3)); diff --git a/Mage.Sets/src/mage/cards/m/MessengersSpeed.java b/Mage.Sets/src/mage/cards/m/MessengersSpeed.java index f2931db2894..74f68e424b8 100644 --- a/Mage.Sets/src/mage/cards/m/MessengersSpeed.java +++ b/Mage.Sets/src/mage/cards/m/MessengersSpeed.java @@ -36,7 +36,7 @@ public final class MessengersSpeed extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has trample and haste. ability = new SimpleStaticAbility( diff --git a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java index 72cca61d6f2..1be84b12bfc 100644 --- a/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java +++ b/Mage.Sets/src/mage/cards/m/MetamorphicAlteration.java @@ -34,7 +34,7 @@ public final class MetamorphicAlteration extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As Metamorphic Alteration enters the battlefield, choose a creature. diff --git a/Mage.Sets/src/mage/cards/m/MidnightCovenant.java b/Mage.Sets/src/mage/cards/m/MidnightCovenant.java index 3d43a18dbb7..baa33f0275e 100644 --- a/Mage.Sets/src/mage/cards/m/MidnightCovenant.java +++ b/Mage.Sets/src/mage/cards/m/MidnightCovenant.java @@ -31,7 +31,7 @@ public final class MidnightCovenant extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "{B}: This creature gets +1/+1 until end of turn." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B)), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/m/MindControl.java b/Mage.Sets/src/mage/cards/m/MindControl.java index dbfe56d8132..eb0eca3bc2a 100644 --- a/Mage.Sets/src/mage/cards/m/MindControl.java +++ b/Mage.Sets/src/mage/cards/m/MindControl.java @@ -32,7 +32,7 @@ public final class MindControl extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/m/MindHarness.java b/Mage.Sets/src/mage/cards/m/MindHarness.java index 44346bbd588..b9a73294e59 100644 --- a/Mage.Sets/src/mage/cards/m/MindHarness.java +++ b/Mage.Sets/src/mage/cards/m/MindHarness.java @@ -42,7 +42,7 @@ public final class MindHarness extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Cumulative upkeep {1} diff --git a/Mage.Sets/src/mage/cards/m/MindWhip.java b/Mage.Sets/src/mage/cards/m/MindWhip.java index efc986d4779..57bd08d51cf 100644 --- a/Mage.Sets/src/mage/cards/m/MindWhip.java +++ b/Mage.Sets/src/mage/cards/m/MindWhip.java @@ -38,7 +38,7 @@ public final class MindWhip extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of the upkeep of enchanted creature's controller, that player may pay {3}. If they don't, Mind Whip deals 2 damage to that player and you tap that creature. diff --git a/Mage.Sets/src/mage/cards/m/MinimusContainment.java b/Mage.Sets/src/mage/cards/m/MinimusContainment.java index fc8305a0920..e210cd75d65 100644 --- a/Mage.Sets/src/mage/cards/m/MinimusContainment.java +++ b/Mage.Sets/src/mage/cards/m/MinimusContainment.java @@ -32,7 +32,7 @@ public final class MinimusContainment extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_NON_LAND); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent is a Treasure artifact with "{T}, Sacrifice this artifact: Add one mana of any color," and it loses all other abilities. diff --git a/Mage.Sets/src/mage/cards/m/MinionsReturn.java b/Mage.Sets/src/mage/cards/m/MinionsReturn.java index 08404939130..cbf11c06089 100644 --- a/Mage.Sets/src/mage/cards/m/MinionsReturn.java +++ b/Mage.Sets/src/mage/cards/m/MinionsReturn.java @@ -33,7 +33,7 @@ public final class MinionsReturn extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, return that card to the battlefield under your control. diff --git a/Mage.Sets/src/mage/cards/m/MireBlight.java b/Mage.Sets/src/mage/cards/m/MireBlight.java index 3e675f06565..b582557bdcb 100644 --- a/Mage.Sets/src/mage/cards/m/MireBlight.java +++ b/Mage.Sets/src/mage/cards/m/MireBlight.java @@ -30,7 +30,7 @@ public final class MireBlight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature is dealt damage, destroy it. this.addAbility(new DealtDamageAttachedTriggeredAbility(new DestroyAttachedToEffect("it"), false).setTriggerPhrase("When enchanted creature is dealt damage, ")); diff --git a/Mage.Sets/src/mage/cards/m/MiresGrasp.java b/Mage.Sets/src/mage/cards/m/MiresGrasp.java index 9c76c6658a0..6bce0a51118 100644 --- a/Mage.Sets/src/mage/cards/m/MiresGrasp.java +++ b/Mage.Sets/src/mage/cards/m/MiresGrasp.java @@ -29,7 +29,7 @@ public final class MiresGrasp extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-3. diff --git a/Mage.Sets/src/mage/cards/m/MirrorMockery.java b/Mage.Sets/src/mage/cards/m/MirrorMockery.java index c8fb636afbd..38c4e482788 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorMockery.java +++ b/Mage.Sets/src/mage/cards/m/MirrorMockery.java @@ -36,7 +36,7 @@ public final class MirrorMockery extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Copy)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, you may create a token that's a copy of that creature. Exile that token at the end of combat. diff --git a/Mage.Sets/src/mage/cards/m/MistformMask.java b/Mage.Sets/src/mage/cards/m/MistformMask.java index f1d815ae762..38ef1fd0105 100644 --- a/Mage.Sets/src/mage/cards/m/MistformMask.java +++ b/Mage.Sets/src/mage/cards/m/MistformMask.java @@ -36,7 +36,7 @@ public final class MistformMask extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {1}: Enchanted creature becomes the creature type of your choice until end of turn. diff --git a/Mage.Sets/src/mage/cards/m/MistsOfLittjara.java b/Mage.Sets/src/mage/cards/m/MistsOfLittjara.java index 75b3b1a85bf..2a1c70c564c 100644 --- a/Mage.Sets/src/mage/cards/m/MistsOfLittjara.java +++ b/Mage.Sets/src/mage/cards/m/MistsOfLittjara.java @@ -43,7 +43,7 @@ public final class MistsOfLittjara extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-0 diff --git a/Mage.Sets/src/mage/cards/m/MobMentality.java b/Mage.Sets/src/mage/cards/m/MobMentality.java index afe16a3ce63..d2cc8f0f697 100644 --- a/Mage.Sets/src/mage/cards/m/MobMentality.java +++ b/Mage.Sets/src/mage/cards/m/MobMentality.java @@ -37,7 +37,7 @@ public final class MobMentality extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has trample. diff --git a/Mage.Sets/src/mage/cards/m/MogissFavor.java b/Mage.Sets/src/mage/cards/m/MogissFavor.java index 277662b4c72..1ecc7f717d7 100644 --- a/Mage.Sets/src/mage/cards/m/MogissFavor.java +++ b/Mage.Sets/src/mage/cards/m/MogissFavor.java @@ -30,7 +30,7 @@ public final class MogissFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/-1. diff --git a/Mage.Sets/src/mage/cards/m/MoldervineCloak.java b/Mage.Sets/src/mage/cards/m/MoldervineCloak.java index fc663a6989f..6681efbd7b4 100644 --- a/Mage.Sets/src/mage/cards/m/MoldervineCloak.java +++ b/Mage.Sets/src/mage/cards/m/MoldervineCloak.java @@ -32,7 +32,7 @@ public final class MoldervineCloak extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); // Dredge 2 diff --git a/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java b/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java index 36b01697ec5..1afcbfd47c8 100644 --- a/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java +++ b/Mage.Sets/src/mage/cards/m/MoltingSnakeskin.java @@ -37,7 +37,7 @@ public final class MoltingSnakeskin extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0 and has "{2}{B}: Regenerate this creature." diff --git a/Mage.Sets/src/mage/cards/m/Momentum.java b/Mage.Sets/src/mage/cards/m/Momentum.java index dc84bc0d36d..192a0124532 100644 --- a/Mage.Sets/src/mage/cards/m/Momentum.java +++ b/Mage.Sets/src/mage/cards/m/Momentum.java @@ -36,7 +36,7 @@ public final class Momentum extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, you may put a growth counter on Momentum. diff --git a/Mage.Sets/src/mage/cards/m/MortalObstinacy.java b/Mage.Sets/src/mage/cards/m/MortalObstinacy.java index e7b2950f941..57e9a37fc8e 100644 --- a/Mage.Sets/src/mage/cards/m/MortalObstinacy.java +++ b/Mage.Sets/src/mage/cards/m/MortalObstinacy.java @@ -42,7 +42,7 @@ public final class MortalObstinacy extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/m/MortalWound.java b/Mage.Sets/src/mage/cards/m/MortalWound.java index 9ed20002edb..fa9bd9ccc80 100644 --- a/Mage.Sets/src/mage/cards/m/MortalWound.java +++ b/Mage.Sets/src/mage/cards/m/MortalWound.java @@ -29,7 +29,7 @@ public final class MortalWound extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature is dealt damage, destroy it. this.addAbility(new DealtDamageAttachedTriggeredAbility(new DestroyAttachedToEffect("it"), false)); diff --git a/Mage.Sets/src/mage/cards/m/MostWanted.java b/Mage.Sets/src/mage/cards/m/MostWanted.java index cbfd5aba787..6bf32ac0a29 100644 --- a/Mage.Sets/src/mage/cards/m/MostWanted.java +++ b/Mage.Sets/src/mage/cards/m/MostWanted.java @@ -35,7 +35,7 @@ public final class MostWanted extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+1. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 1))); diff --git a/Mage.Sets/src/mage/cards/m/Mourning.java b/Mage.Sets/src/mage/cards/m/Mourning.java index e7746b19a43..a8d08667ba0 100644 --- a/Mage.Sets/src/mage/cards/m/Mourning.java +++ b/Mage.Sets/src/mage/cards/m/Mourning.java @@ -30,7 +30,7 @@ public final class Mourning extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-0. diff --git a/Mage.Sets/src/mage/cards/m/MultanisHarmony.java b/Mage.Sets/src/mage/cards/m/MultanisHarmony.java index 516ed37e00a..42215041625 100644 --- a/Mage.Sets/src/mage/cards/m/MultanisHarmony.java +++ b/Mage.Sets/src/mage/cards/m/MultanisHarmony.java @@ -34,7 +34,7 @@ public final class MultanisHarmony extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{T}: Add one mana of any color." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new AnyColorManaAbility(), diff --git a/Mage.Sets/src/mage/cards/m/MurderInvestigation.java b/Mage.Sets/src/mage/cards/m/MurderInvestigation.java index 1be12640d74..eb4838b2c66 100644 --- a/Mage.Sets/src/mage/cards/m/MurderInvestigation.java +++ b/Mage.Sets/src/mage/cards/m/MurderInvestigation.java @@ -35,7 +35,7 @@ public final class MurderInvestigation extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, create X 1/1 white Soldier creature tokens, where X is its power. diff --git a/Mage.Sets/src/mage/cards/m/Muzzle.java b/Mage.Sets/src/mage/cards/m/Muzzle.java index b096ca6f97f..2321caf2a6a 100644 --- a/Mage.Sets/src/mage/cards/m/Muzzle.java +++ b/Mage.Sets/src/mage/cards/m/Muzzle.java @@ -32,7 +32,7 @@ public final class Muzzle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Prevent all damage that would be dealt by enchanted creature. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PreventAllDamageByAttachedEffect(Duration.WhileOnBattlefield, "enchanted creature", false))); diff --git a/Mage.Sets/src/mage/cards/m/MysticMight.java b/Mage.Sets/src/mage/cards/m/MysticMight.java index 0860d2446b3..c7de6548bc0 100644 --- a/Mage.Sets/src/mage/cards/m/MysticMight.java +++ b/Mage.Sets/src/mage/cards/m/MysticMight.java @@ -38,7 +38,7 @@ public final class MysticMight extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(new FilterControlledLandPermanent()); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Cumulative upkeep {1}{U} this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}{U}"))); diff --git a/Mage.Sets/src/mage/cards/m/MysticRestraints.java b/Mage.Sets/src/mage/cards/m/MysticRestraints.java index 2fc14b0c78c..9ca463218d5 100644 --- a/Mage.Sets/src/mage/cards/m/MysticRestraints.java +++ b/Mage.Sets/src/mage/cards/m/MysticRestraints.java @@ -34,7 +34,7 @@ public final class MysticRestraints extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Mystic Restraints enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. @@ -49,4 +49,4 @@ public final class MysticRestraints extends CardImpl { public MysticRestraints copy() { return new MysticRestraints(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MysticSubdual.java b/Mage.Sets/src/mage/cards/m/MysticSubdual.java index 3393034bb8f..20a84400348 100644 --- a/Mage.Sets/src/mage/cards/m/MysticSubdual.java +++ b/Mage.Sets/src/mage/cards/m/MysticSubdual.java @@ -34,7 +34,7 @@ public final class MysticSubdual extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-0 and loses all abilities. diff --git a/Mage.Sets/src/mage/cards/m/MysticVeil.java b/Mage.Sets/src/mage/cards/m/MysticVeil.java index 8419f3a15c7..ba4d6e2ae31 100644 --- a/Mage.Sets/src/mage/cards/m/MysticVeil.java +++ b/Mage.Sets/src/mage/cards/m/MysticVeil.java @@ -39,7 +39,7 @@ public final class MysticVeil extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shroud. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/m/MythicProportions.java b/Mage.Sets/src/mage/cards/m/MythicProportions.java index 56107261b50..66e5dcdd8b3 100644 --- a/Mage.Sets/src/mage/cards/m/MythicProportions.java +++ b/Mage.Sets/src/mage/cards/m/MythicProportions.java @@ -34,7 +34,7 @@ public final class MythicProportions extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +8/+8 and has trample. diff --git a/Mage.Sets/src/mage/cards/n/NahirisBinding.java b/Mage.Sets/src/mage/cards/n/NahirisBinding.java index fa32f066735..872d63d18e8 100644 --- a/Mage.Sets/src/mage/cards/n/NahirisBinding.java +++ b/Mage.Sets/src/mage/cards/n/NahirisBinding.java @@ -29,7 +29,7 @@ public final class NahirisBinding extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_CREATURE_OR_PLANESWALKER); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent can't attack or block, and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/n/Narcolepsy.java b/Mage.Sets/src/mage/cards/n/Narcolepsy.java index 7afd8b199c1..b2631d186a2 100644 --- a/Mage.Sets/src/mage/cards/n/Narcolepsy.java +++ b/Mage.Sets/src/mage/cards/n/Narcolepsy.java @@ -34,7 +34,7 @@ public final class Narcolepsy extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - EnchantAbility ability = new EnchantAbility(auraTarget.getTargetName()); + EnchantAbility ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of each upkeep, if enchanted creature is untapped, tap it. diff --git a/Mage.Sets/src/mage/cards/n/NaturesChosen.java b/Mage.Sets/src/mage/cards/n/NaturesChosen.java index c64adac97a2..cb627e9d369 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesChosen.java +++ b/Mage.Sets/src/mage/cards/n/NaturesChosen.java @@ -58,7 +58,7 @@ public final class NaturesChosen extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {0}: Untap enchanted creature. Activate this ability only during your turn and only once each turn. diff --git a/Mage.Sets/src/mage/cards/n/NaturesEmbrace.java b/Mage.Sets/src/mage/cards/n/NaturesEmbrace.java index b5e93278e03..eae110fccac 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesEmbrace.java +++ b/Mage.Sets/src/mage/cards/n/NaturesEmbrace.java @@ -45,7 +45,7 @@ public final class NaturesEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted permanent is a creature, it gets +2/+2. @@ -91,4 +91,4 @@ enum NaturesEmbraceCondition implements Condition { Permanent attached = game.getPermanent(permanent.getAttachedTo()); return attached != null && attached.getCardType(game).contains(cardType); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NaturesKiss.java b/Mage.Sets/src/mage/cards/n/NaturesKiss.java index 7c235419058..2cf32b1afc2 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesKiss.java +++ b/Mage.Sets/src/mage/cards/n/NaturesKiss.java @@ -31,7 +31,7 @@ public final class NaturesKiss extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // {1}, Exile the top card of your graveyard: Enchanted creature gets +1/+1 until end of turn. Ability ability = new SimpleActivatedAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java b/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java index 1714e8b49a9..8d95203467f 100644 --- a/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java +++ b/Mage.Sets/src/mage/cards/n/NecromancersMagemark.java @@ -47,7 +47,7 @@ public final class NecromancersMagemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures you control that are enchanted get +1/+1. diff --git a/Mage.Sets/src/mage/cards/n/NecromanticThirst.java b/Mage.Sets/src/mage/cards/n/NecromanticThirst.java index 4b5e8ecf074..323239c94fe 100644 --- a/Mage.Sets/src/mage/cards/n/NecromanticThirst.java +++ b/Mage.Sets/src/mage/cards/n/NecromanticThirst.java @@ -32,7 +32,7 @@ public final class NecromanticThirst extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature deals combat damage to a player, you may return target creature card from your graveyard to your hand. Ability ability = new DealsDamageToAPlayerAttachedTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/n/Necrosynthesis.java b/Mage.Sets/src/mage/cards/n/Necrosynthesis.java index 5059b112918..f9549e80259 100644 --- a/Mage.Sets/src/mage/cards/n/Necrosynthesis.java +++ b/Mage.Sets/src/mage/cards/n/Necrosynthesis.java @@ -37,7 +37,7 @@ public final class Necrosynthesis extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever another creature dies, put a +1/+1 counter on this creature." diff --git a/Mage.Sets/src/mage/cards/n/NecroticPlague.java b/Mage.Sets/src/mage/cards/n/NecroticPlague.java index 1e279b75a3e..018c7a25707 100644 --- a/Mage.Sets/src/mage/cards/n/NecroticPlague.java +++ b/Mage.Sets/src/mage/cards/n/NecroticPlague.java @@ -39,7 +39,7 @@ public final class NecroticPlague extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "At the beginning of your upkeep, sacrifice this creature." diff --git a/Mage.Sets/src/mage/cards/n/NettlevineBlight.java b/Mage.Sets/src/mage/cards/n/NettlevineBlight.java index 0d6d013e193..e9ee904a537 100644 --- a/Mage.Sets/src/mage/cards/n/NettlevineBlight.java +++ b/Mage.Sets/src/mage/cards/n/NettlevineBlight.java @@ -45,7 +45,7 @@ public final class NettlevineBlight extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent has "At the beginning of your end step, sacrifice this permanent and attach Nettlevine Blight to a creature or land you control." diff --git a/Mage.Sets/src/mage/cards/n/NettlingCurse.java b/Mage.Sets/src/mage/cards/n/NettlingCurse.java index d943ac1f393..cd3124dde54 100644 --- a/Mage.Sets/src/mage/cards/n/NettlingCurse.java +++ b/Mage.Sets/src/mage/cards/n/NettlingCurse.java @@ -31,7 +31,7 @@ public final class NettlingCurse extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks or blocks, its controller loses 3 life. diff --git a/Mage.Sets/src/mage/cards/n/NewHorizons.java b/Mage.Sets/src/mage/cards/n/NewHorizons.java index 9aef5afeb3d..634f76cf786 100644 --- a/Mage.Sets/src/mage/cards/n/NewHorizons.java +++ b/Mage.Sets/src/mage/cards/n/NewHorizons.java @@ -40,7 +40,7 @@ public final class NewHorizons extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When New Horizons enters the battlefield, put a +1/+1 counter on target creature you control. diff --git a/Mage.Sets/src/mage/cards/n/NextOfKin.java b/Mage.Sets/src/mage/cards/n/NextOfKin.java index 2a3818aa554..9d8f49b6d6b 100644 --- a/Mage.Sets/src/mage/cards/n/NextOfKin.java +++ b/Mage.Sets/src/mage/cards/n/NextOfKin.java @@ -42,7 +42,7 @@ public class NextOfKin extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When enchanted creature dies, you may put a creature card you own with lesser mana value from your hand or from the command zone onto the battlefield. // If you do, return Next of Kin to the battlefield attached to that creature at the beginning of the next end step. @@ -103,4 +103,4 @@ class NextOfKinDiesEffect extends OneShotEffect { public NextOfKinDiesEffect copy() { return new NextOfKinDiesEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NimbusWings.java b/Mage.Sets/src/mage/cards/n/NimbusWings.java index 7dfbee6d766..39a5e9c403f 100644 --- a/Mage.Sets/src/mage/cards/n/NimbusWings.java +++ b/Mage.Sets/src/mage/cards/n/NimbusWings.java @@ -35,7 +35,7 @@ public final class NimbusWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+2 and has flying. SimpleStaticAbility ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); ability.addEffect(new GainAbilityAttachedEffect(FlyingAbility.getInstance(), AttachmentType.AURA).setText("and has flying")); diff --git a/Mage.Sets/src/mage/cards/n/NissasZendikon.java b/Mage.Sets/src/mage/cards/n/NissasZendikon.java index 7e583510666..550ebbe9998 100644 --- a/Mage.Sets/src/mage/cards/n/NissasZendikon.java +++ b/Mage.Sets/src/mage/cards/n/NissasZendikon.java @@ -36,7 +36,7 @@ public final class NissasZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is a 4/4 Elemental creature with reach and haste. It's still a land. @@ -80,4 +80,4 @@ class NissasZendikonToken extends TokenImpl { public NissasZendikonToken copy() { return new NissasZendikonToken(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/n/NoxiousField.java b/Mage.Sets/src/mage/cards/n/NoxiousField.java index 26188499a72..9e538f6d818 100644 --- a/Mage.Sets/src/mage/cards/n/NoxiousField.java +++ b/Mage.Sets/src/mage/cards/n/NoxiousField.java @@ -35,7 +35,7 @@ public final class NoxiousField extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: This land deals 1 damage to each creature and each player." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/n/NumbingDose.java b/Mage.Sets/src/mage/cards/n/NumbingDose.java index 76891bee5bf..9286ba398ff 100644 --- a/Mage.Sets/src/mage/cards/n/NumbingDose.java +++ b/Mage.Sets/src/mage/cards/n/NumbingDose.java @@ -46,7 +46,7 @@ public final class NumbingDose extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted permanent doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect("permanent"))); diff --git a/Mage.Sets/src/mage/cards/n/NurturingPresence.java b/Mage.Sets/src/mage/cards/n/NurturingPresence.java index e5cae38bfc2..f4cc11b621f 100644 --- a/Mage.Sets/src/mage/cards/n/NurturingPresence.java +++ b/Mage.Sets/src/mage/cards/n/NurturingPresence.java @@ -33,7 +33,7 @@ public final class NurturingPresence extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever a creature enters the battlefield under your control, this creature gets +1/+1 until end of turn." diff --git a/Mage.Sets/src/mage/cards/n/NyleasPresence.java b/Mage.Sets/src/mage/cards/n/NyleasPresence.java index fea94818a4b..0ef59d2f115 100644 --- a/Mage.Sets/src/mage/cards/n/NyleasPresence.java +++ b/Mage.Sets/src/mage/cards/n/NyleasPresence.java @@ -31,7 +31,7 @@ public final class NyleasPresence extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Nylea's Presence enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/n/NyxInfusion.java b/Mage.Sets/src/mage/cards/n/NyxInfusion.java index 04868e7eb29..8caf2a5c94b 100644 --- a/Mage.Sets/src/mage/cards/n/NyxInfusion.java +++ b/Mage.Sets/src/mage/cards/n/NyxInfusion.java @@ -42,7 +42,7 @@ public final class NyxInfusion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 as long as it's an enchantment. Otherwise, it gets -2/-2. diff --git a/Mage.Sets/src/mage/cards/o/Oakenform.java b/Mage.Sets/src/mage/cards/o/Oakenform.java index cb15a216881..8021f1c961d 100644 --- a/Mage.Sets/src/mage/cards/o/Oakenform.java +++ b/Mage.Sets/src/mage/cards/o/Oakenform.java @@ -36,7 +36,7 @@ public final class Oakenform extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OakenformEffect())); } @@ -98,4 +98,4 @@ class OakenformEffect extends ContinuousEffectImpl { return new OakenformEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/o/OblivionCrown.java b/Mage.Sets/src/mage/cards/o/OblivionCrown.java index 17e7e44c455..efd853c6ad4 100644 --- a/Mage.Sets/src/mage/cards/o/OblivionCrown.java +++ b/Mage.Sets/src/mage/cards/o/OblivionCrown.java @@ -38,7 +38,7 @@ public final class OblivionCrown extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "Discard a card: This creature gets +1/+1 until end of turn." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn),new DiscardCardCost()), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/o/OctopusUmbra.java b/Mage.Sets/src/mage/cards/o/OctopusUmbra.java index f183b9e45df..acf18247ad7 100644 --- a/Mage.Sets/src/mage/cards/o/OctopusUmbra.java +++ b/Mage.Sets/src/mage/cards/o/OctopusUmbra.java @@ -44,7 +44,7 @@ public final class OctopusUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has base power and toughness 8/8 and has "Whenever this creature attacks, you may tap target creature with power 8 or less." diff --git a/Mage.Sets/src/mage/cards/o/OcularHalo.java b/Mage.Sets/src/mage/cards/o/OcularHalo.java index adfc976cdb5..640c82217fb 100644 --- a/Mage.Sets/src/mage/cards/o/OcularHalo.java +++ b/Mage.Sets/src/mage/cards/o/OcularHalo.java @@ -37,7 +37,7 @@ public final class OcularHalo extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: Draw a card." diff --git a/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java b/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java index 942c5bdc151..83486df6ff0 100644 --- a/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java +++ b/Mage.Sets/src/mage/cards/o/OldGrowthTroll.java @@ -179,7 +179,7 @@ class OldGrowthTrollContinuousEffect extends ContinuousEffectImpl { TargetPermanent auraTarget = new TargetPermanent(filter); troll.getSpellAbility().addTarget(auraTarget); troll.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - troll.addAbility(new EnchantAbility(auraTarget.getTargetName()), source.getSourceId(), game); + troll.addAbility(new EnchantAbility(auraTarget), source.getSourceId(), game); // add the activated ability troll.addAbility(makeAbility(), source.getSourceId(), game); diff --git a/Mage.Sets/src/mage/cards/o/OnSerrasWings.java b/Mage.Sets/src/mage/cards/o/OnSerrasWings.java index f4efcaa62b8..d527be92fc4 100644 --- a/Mage.Sets/src/mage/cards/o/OnSerrasWings.java +++ b/Mage.Sets/src/mage/cards/o/OnSerrasWings.java @@ -41,7 +41,7 @@ public final class OnSerrasWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature is legendary, gets +1/+1, and has flying, vigilance, and lifelink. diff --git a/Mage.Sets/src/mage/cards/o/OnThinIce.java b/Mage.Sets/src/mage/cards/o/OnThinIce.java index 18175052d2d..d75d5db5903 100644 --- a/Mage.Sets/src/mage/cards/o/OnThinIce.java +++ b/Mage.Sets/src/mage/cards/o/OnThinIce.java @@ -41,7 +41,7 @@ public final class OnThinIce extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When On Thin Ice enters the battlefield, exile target creature an opponent controls until On Thin Ice leaves the battlefield. diff --git a/Mage.Sets/src/mage/cards/o/OneThousandLashes.java b/Mage.Sets/src/mage/cards/o/OneThousandLashes.java index 72a5769408d..1f00503ccbc 100644 --- a/Mage.Sets/src/mage/cards/o/OneThousandLashes.java +++ b/Mage.Sets/src/mage/cards/o/OneThousandLashes.java @@ -34,7 +34,7 @@ public final class OneThousandLashes extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/o/OneWithNature.java b/Mage.Sets/src/mage/cards/o/OneWithNature.java index 652ff85e272..0876ef5e9e6 100644 --- a/Mage.Sets/src/mage/cards/o/OneWithNature.java +++ b/Mage.Sets/src/mage/cards/o/OneWithNature.java @@ -33,7 +33,7 @@ public final class OneWithNature extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutLandInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature deals combat damage to a player, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library. diff --git a/Mage.Sets/src/mage/cards/o/OneWithTheKami.java b/Mage.Sets/src/mage/cards/o/OneWithTheKami.java index b8b699132e9..98384361dd9 100644 --- a/Mage.Sets/src/mage/cards/o/OneWithTheKami.java +++ b/Mage.Sets/src/mage/cards/o/OneWithTheKami.java @@ -48,7 +48,7 @@ public final class OneWithTheKami extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature or another modified creature you control dies, create X 1/1 colorless Spirit creature tokens, where X is that creature's power. this.addAbility(new DiesCreatureTriggeredAbility(new CreateTokenEffect( diff --git a/Mage.Sets/src/mage/cards/o/OneWithTheStars.java b/Mage.Sets/src/mage/cards/o/OneWithTheStars.java index 366ece0b2c2..7c3213b7fc7 100644 --- a/Mage.Sets/src/mage/cards/o/OneWithTheStars.java +++ b/Mage.Sets/src/mage/cards/o/OneWithTheStars.java @@ -39,7 +39,7 @@ public final class OneWithTheStars extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent is an enchantment and loses all other card types. diff --git a/Mage.Sets/src/mage/cards/o/OneWithTheWind.java b/Mage.Sets/src/mage/cards/o/OneWithTheWind.java index f97a602245e..521542a0089 100644 --- a/Mage.Sets/src/mage/cards/o/OneWithTheWind.java +++ b/Mage.Sets/src/mage/cards/o/OneWithTheWind.java @@ -35,7 +35,7 @@ public final class OneWithTheWind extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. diff --git a/Mage.Sets/src/mage/cards/o/OniPossession.java b/Mage.Sets/src/mage/cards/o/OniPossession.java index 2439cffd720..4fddf595442 100644 --- a/Mage.Sets/src/mage/cards/o/OniPossession.java +++ b/Mage.Sets/src/mage/cards/o/OniPossession.java @@ -35,7 +35,7 @@ public final class OniPossession extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, sacrifice a creature. diff --git a/Mage.Sets/src/mage/cards/o/OphidianEye.java b/Mage.Sets/src/mage/cards/o/OphidianEye.java index 417a2437d55..70abd5bdfec 100644 --- a/Mage.Sets/src/mage/cards/o/OphidianEye.java +++ b/Mage.Sets/src/mage/cards/o/OphidianEye.java @@ -33,7 +33,7 @@ public final class OphidianEye extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature deals damage to an opponent, you may draw a card. this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new DrawCardSourceControllerEffect(1), "enchanted creature", true, false, false, TargetController.OPPONENT)); diff --git a/Mage.Sets/src/mage/cards/o/OppressiveRays.java b/Mage.Sets/src/mage/cards/o/OppressiveRays.java index 8f6f1bdab8d..4188e3cf3b4 100644 --- a/Mage.Sets/src/mage/cards/o/OppressiveRays.java +++ b/Mage.Sets/src/mage/cards/o/OppressiveRays.java @@ -40,7 +40,7 @@ public final class OppressiveRays extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block unless its controller pays {3}. diff --git a/Mage.Sets/src/mage/cards/o/OraclesInsight.java b/Mage.Sets/src/mage/cards/o/OraclesInsight.java index 4144be7f3ff..bdade2f208f 100644 --- a/Mage.Sets/src/mage/cards/o/OraclesInsight.java +++ b/Mage.Sets/src/mage/cards/o/OraclesInsight.java @@ -36,7 +36,7 @@ public final class OraclesInsight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{T}: Scry 1, then draw a card." diff --git a/Mage.Sets/src/mage/cards/o/OrcishMine.java b/Mage.Sets/src/mage/cards/o/OrcishMine.java index c8a4a1a71b6..71afeecb5d2 100644 --- a/Mage.Sets/src/mage/cards/o/OrcishMine.java +++ b/Mage.Sets/src/mage/cards/o/OrcishMine.java @@ -39,7 +39,7 @@ public final class OrcishMine extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DestroyPermanent)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Orcish Mine enters the battlefield with three ore counters on it. @@ -100,4 +100,4 @@ class OrcishMineAbility extends TriggeredAbilityImpl { public String getRule() { return "When the last ore counter is removed from {this}, destroy enchanted land and {this} deals 2 damage to that land's controller."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/o/OrdealOfErebos.java b/Mage.Sets/src/mage/cards/o/OrdealOfErebos.java index 6e32b97acc3..15b098f4430 100644 --- a/Mage.Sets/src/mage/cards/o/OrdealOfErebos.java +++ b/Mage.Sets/src/mage/cards/o/OrdealOfErebos.java @@ -38,7 +38,7 @@ public final class OrdealOfErebos extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, put a +1/+1 counter on it. Then if it has three or more +1/+1 counters on it, sacrifice Ordeal of Erebos. diff --git a/Mage.Sets/src/mage/cards/o/OrdealOfHeliod.java b/Mage.Sets/src/mage/cards/o/OrdealOfHeliod.java index d6a8d233d6e..6facaa739a9 100644 --- a/Mage.Sets/src/mage/cards/o/OrdealOfHeliod.java +++ b/Mage.Sets/src/mage/cards/o/OrdealOfHeliod.java @@ -36,7 +36,7 @@ public final class OrdealOfHeliod extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, put a +1/+1 counter on it. Then if it has three or more +1/+1 counters on it, sacrifice Ordeal of Heliod. ability = new AttacksAttachedTriggeredAbility(new AddCountersAttachedEffect(CounterType.P1P1.createInstance(),"it"), AttachmentType.AURA, false); diff --git a/Mage.Sets/src/mage/cards/o/OrdealOfNylea.java b/Mage.Sets/src/mage/cards/o/OrdealOfNylea.java index 387a3586733..aaeb6122b5e 100644 --- a/Mage.Sets/src/mage/cards/o/OrdealOfNylea.java +++ b/Mage.Sets/src/mage/cards/o/OrdealOfNylea.java @@ -39,7 +39,7 @@ public final class OrdealOfNylea extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, put a +1/+1 counter on it. Then if it has three or more +1/+1 counters on it, sacrifice Ordeal of Nylea. diff --git a/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java b/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java index 79a0c3d9c6d..e79c1576949 100644 --- a/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java +++ b/Mage.Sets/src/mage/cards/o/OrdealOfPurphoros.java @@ -38,7 +38,7 @@ public final class OrdealOfPurphoros extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, put a +1/+1 counter on it. Then if it has three or more +1/+1 counters on it, sacrifice Ordeal of Purphoros. ability = new AttacksAttachedTriggeredAbility(new AddCountersAttachedEffect(CounterType.P1P1.createInstance(),"it"), AttachmentType.AURA, false); diff --git a/Mage.Sets/src/mage/cards/o/OrdealOfThassa.java b/Mage.Sets/src/mage/cards/o/OrdealOfThassa.java index 146b655e416..52cf98261fd 100644 --- a/Mage.Sets/src/mage/cards/o/OrdealOfThassa.java +++ b/Mage.Sets/src/mage/cards/o/OrdealOfThassa.java @@ -37,7 +37,7 @@ public final class OrdealOfThassa extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, put a +1/+1 counter on it. Then if it has three or more +1/+1 counters on it, sacrifice Ordeal of Thassa. ability = new AttacksAttachedTriggeredAbility(new AddCountersAttachedEffect(CounterType.P1P1.createInstance(),"it"), AttachmentType.AURA, false); diff --git a/Mage.Sets/src/mage/cards/o/Overgrowth.java b/Mage.Sets/src/mage/cards/o/Overgrowth.java index 34d608737b5..298546daecc 100644 --- a/Mage.Sets/src/mage/cards/o/Overgrowth.java +++ b/Mage.Sets/src/mage/cards/o/Overgrowth.java @@ -29,7 +29,7 @@ public final class Overgrowth extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land is tapped for mana, its controller adds {G}{G}. diff --git a/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java b/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java index ed0cc4230a7..0e19f2f32e4 100644 --- a/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java +++ b/Mage.Sets/src/mage/cards/o/OverwhelmingSplendor.java @@ -38,7 +38,7 @@ public final class OverwhelmingSplendor extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Creatures enchanted player controls lose all abilities and have base power and toughness 1/1. diff --git a/Mage.Sets/src/mage/cards/p/Pacifism.java b/Mage.Sets/src/mage/cards/p/Pacifism.java index 857293fe427..00097749539 100644 --- a/Mage.Sets/src/mage/cards/p/Pacifism.java +++ b/Mage.Sets/src/mage/cards/p/Pacifism.java @@ -32,7 +32,7 @@ public final class Pacifism extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantAttackBlockAttachedEffect(AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/p/ParadoxHaze.java b/Mage.Sets/src/mage/cards/p/ParadoxHaze.java index 7ccf2f5db66..819689217e1 100644 --- a/Mage.Sets/src/mage/cards/p/ParadoxHaze.java +++ b/Mage.Sets/src/mage/cards/p/ParadoxHaze.java @@ -33,7 +33,7 @@ public final class ParadoxHaze extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of enchanted player's first upkeep each turn, that player gets an additional upkeep step after this step. this.addAbility(new ParadoxHazeTriggeredAbility(), new ParadoxHazeWatcher()); diff --git a/Mage.Sets/src/mage/cards/p/ParallaxDementia.java b/Mage.Sets/src/mage/cards/p/ParallaxDementia.java index 51f48063943..453a3e3fac5 100644 --- a/Mage.Sets/src/mage/cards/p/ParallaxDementia.java +++ b/Mage.Sets/src/mage/cards/p/ParallaxDementia.java @@ -34,7 +34,7 @@ public final class ParallaxDementia extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Fading 1 this.addAbility(new FadingAbility(1, this)); diff --git a/Mage.Sets/src/mage/cards/p/Paralyze.java b/Mage.Sets/src/mage/cards/p/Paralyze.java index 781c9ac6ea7..31d80281f5b 100644 --- a/Mage.Sets/src/mage/cards/p/Paralyze.java +++ b/Mage.Sets/src/mage/cards/p/Paralyze.java @@ -34,7 +34,7 @@ public final class Paralyze extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Paralyze enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java b/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java index f1ced0f484c..7f023cfd984 100644 --- a/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java +++ b/Mage.Sets/src/mage/cards/p/ParalyzingGrasp.java @@ -30,7 +30,7 @@ public final class ParalyzingGrasp extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); } diff --git a/Mage.Sets/src/mage/cards/p/ParasiticBond.java b/Mage.Sets/src/mage/cards/p/ParasiticBond.java index 600667bf31b..55cc46692e2 100644 --- a/Mage.Sets/src/mage/cards/p/ParasiticBond.java +++ b/Mage.Sets/src/mage/cards/p/ParasiticBond.java @@ -31,7 +31,7 @@ public final class ParasiticBond extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of the upkeep of enchanted creature's controller, Parasitic Bond deals 2 damage to that player. Effect effect = new DamageTargetEffect(2); effect.setText("{this} deals 2 damage to that player"); diff --git a/Mage.Sets/src/mage/cards/p/ParasiticImpetus.java b/Mage.Sets/src/mage/cards/p/ParasiticImpetus.java index 1967a6ffcc4..de721144861 100644 --- a/Mage.Sets/src/mage/cards/p/ParasiticImpetus.java +++ b/Mage.Sets/src/mage/cards/p/ParasiticImpetus.java @@ -34,7 +34,7 @@ public final class ParasiticImpetus extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and is goaded. diff --git a/Mage.Sets/src/mage/cards/p/ParasiticImplant.java b/Mage.Sets/src/mage/cards/p/ParasiticImplant.java index 79524906bdb..1512e663241 100644 --- a/Mage.Sets/src/mage/cards/p/ParasiticImplant.java +++ b/Mage.Sets/src/mage/cards/p/ParasiticImplant.java @@ -32,7 +32,7 @@ public final class ParasiticImplant extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Sacrifice)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); ability = new BeginningOfUpkeepTriggeredAbility(new ParasiticImplantEffect(), TargetController.YOU, false); ability.addEffect(new CreateTokenEffect(new PhyrexianMyrToken())); diff --git a/Mage.Sets/src/mage/cards/p/Pariah.java b/Mage.Sets/src/mage/cards/p/Pariah.java index 122d3801d07..f3f8ed02c06 100644 --- a/Mage.Sets/src/mage/cards/p/Pariah.java +++ b/Mage.Sets/src/mage/cards/p/Pariah.java @@ -35,7 +35,7 @@ public final class Pariah extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // All damage that would be dealt to you is dealt to enchanted creature instead. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PariahEffect())); diff --git a/Mage.Sets/src/mage/cards/p/Paroxysm.java b/Mage.Sets/src/mage/cards/p/Paroxysm.java index 1a7a9cf730e..3aff112ac2d 100644 --- a/Mage.Sets/src/mage/cards/p/Paroxysm.java +++ b/Mage.Sets/src/mage/cards/p/Paroxysm.java @@ -41,7 +41,7 @@ public final class Paroxysm extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of the upkeep of enchanted creature's controller, that player reveals the top card of their library. diff --git a/Mage.Sets/src/mage/cards/p/PatriarchsDesire.java b/Mage.Sets/src/mage/cards/p/PatriarchsDesire.java index 64ca1b97c0c..ce4733b56e8 100644 --- a/Mage.Sets/src/mage/cards/p/PatriarchsDesire.java +++ b/Mage.Sets/src/mage/cards/p/PatriarchsDesire.java @@ -35,7 +35,7 @@ public final class PatriarchsDesire extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/-2. diff --git a/Mage.Sets/src/mage/cards/p/PatternOfRebirth.java b/Mage.Sets/src/mage/cards/p/PatternOfRebirth.java index c963483b94f..e1ddcefca87 100644 --- a/Mage.Sets/src/mage/cards/p/PatternOfRebirth.java +++ b/Mage.Sets/src/mage/cards/p/PatternOfRebirth.java @@ -31,7 +31,7 @@ public final class PatternOfRebirth extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, that creature's controller may search their library for a creature card and put that card onto the battlefield. If that player does, they shuffle their library. diff --git a/Mage.Sets/src/mage/cards/p/PemminsAura.java b/Mage.Sets/src/mage/cards/p/PemminsAura.java index 4ea91e83d8d..f88be2eb0f5 100644 --- a/Mage.Sets/src/mage/cards/p/PemminsAura.java +++ b/Mage.Sets/src/mage/cards/p/PemminsAura.java @@ -38,7 +38,7 @@ public final class PemminsAura extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {U}: Untap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/p/PendrellFlux.java b/Mage.Sets/src/mage/cards/p/PendrellFlux.java index 54dae203e95..c8f9204269e 100644 --- a/Mage.Sets/src/mage/cards/p/PendrellFlux.java +++ b/Mage.Sets/src/mage/cards/p/PendrellFlux.java @@ -36,7 +36,7 @@ public final class PendrellFlux extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "At the beginning of your upkeep, sacrifice this creature unless you pay its mana cost." ability = new BeginningOfUpkeepTriggeredAbility(new PendrellFluxEffect(), TargetController.YOU, false); @@ -91,4 +91,4 @@ class PendrellFluxEffect extends OneShotEffect { return new mage.cards.p.PendrellFluxEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/p/PentarchWard.java b/Mage.Sets/src/mage/cards/p/PentarchWard.java index d88036745f9..df956aca09a 100644 --- a/Mage.Sets/src/mage/cards/p/PentarchWard.java +++ b/Mage.Sets/src/mage/cards/p/PentarchWard.java @@ -33,7 +33,7 @@ public final class PentarchWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Pentarch Ward enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); @@ -53,4 +53,4 @@ public final class PentarchWard extends CardImpl { public PentarchWard copy() { return new PentarchWard(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/p/Persuasion.java b/Mage.Sets/src/mage/cards/p/Persuasion.java index 255c67beeaf..508515296ab 100644 --- a/Mage.Sets/src/mage/cards/p/Persuasion.java +++ b/Mage.Sets/src/mage/cards/p/Persuasion.java @@ -31,7 +31,7 @@ public final class Persuasion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java b/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java index 6534c486adc..1fdd666580f 100644 --- a/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java +++ b/Mage.Sets/src/mage/cards/p/PetrifiedPlating.java @@ -33,7 +33,7 @@ public final class PetrifiedPlating extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java b/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java index 9ca041c34e0..04729f4ed4e 100644 --- a/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java +++ b/Mage.Sets/src/mage/cards/p/PhantasmalTerrain.java @@ -31,7 +31,7 @@ public final class PhantasmalTerrain extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As Phantasmal Terrain enters the battlefield, choose a basic land type. this.addAbility(new AsEntersBattlefieldAbility(new ChooseBasicLandTypeEffect(Outcome.Neutral))); diff --git a/Mage.Sets/src/mage/cards/p/PhantomWings.java b/Mage.Sets/src/mage/cards/p/PhantomWings.java index 8318431b711..027dc074347 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomWings.java +++ b/Mage.Sets/src/mage/cards/p/PhantomWings.java @@ -33,7 +33,7 @@ public final class PhantomWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. diff --git a/Mage.Sets/src/mage/cards/p/Phyresis.java b/Mage.Sets/src/mage/cards/p/Phyresis.java index d6436561972..6b2b413651a 100644 --- a/Mage.Sets/src/mage/cards/p/Phyresis.java +++ b/Mage.Sets/src/mage/cards/p/Phyresis.java @@ -33,7 +33,7 @@ public final class Phyresis extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java b/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java index f01f32d36b3..cb95a667758 100644 --- a/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java +++ b/Mage.Sets/src/mage/cards/p/PhyrexianBoon.java @@ -34,7 +34,7 @@ public final class PhyrexianBoon extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1 as long as it's black. Otherwise, it gets -1/-2. diff --git a/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java b/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java index cc8b027db9e..30517638fb1 100644 --- a/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java +++ b/Mage.Sets/src/mage/cards/p/PilloryOfTheSleepless.java @@ -35,7 +35,7 @@ public final class PilloryOfTheSleepless extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. diff --git a/Mage.Sets/src/mage/cards/p/PinToTheEarth.java b/Mage.Sets/src/mage/cards/p/PinToTheEarth.java index 82d3de87b2d..2133aed83da 100644 --- a/Mage.Sets/src/mage/cards/p/PinToTheEarth.java +++ b/Mage.Sets/src/mage/cards/p/PinToTheEarth.java @@ -32,7 +32,7 @@ public final class PinToTheEarth extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -6/-0. diff --git a/Mage.Sets/src/mage/cards/p/PiousInterdiction.java b/Mage.Sets/src/mage/cards/p/PiousInterdiction.java index 334e484f238..fbf5e461444 100644 --- a/Mage.Sets/src/mage/cards/p/PiousInterdiction.java +++ b/Mage.Sets/src/mage/cards/p/PiousInterdiction.java @@ -34,7 +34,7 @@ public final class PiousInterdiction extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Pious Interdiction enters the battlefield, you gain 2 life. diff --git a/Mage.Sets/src/mage/cards/p/PledgeOfLoyalty.java b/Mage.Sets/src/mage/cards/p/PledgeOfLoyalty.java index c74c0ac7371..df904069bae 100644 --- a/Mage.Sets/src/mage/cards/p/PledgeOfLoyalty.java +++ b/Mage.Sets/src/mage/cards/p/PledgeOfLoyalty.java @@ -43,7 +43,7 @@ public final class PledgeOfLoyalty extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has protection from the colors of permanents you control. This effect doesn't remove Pledge of Loyalty. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java b/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java index 3e3123d345a..0769b0c6cc7 100644 --- a/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java +++ b/Mage.Sets/src/mage/cards/p/PlumesOfPeace.java @@ -32,7 +32,7 @@ public final class PlumesOfPeace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/p/PollenbrightWings.java b/Mage.Sets/src/mage/cards/p/PollenbrightWings.java index 0ea8efb9356..37436913734 100644 --- a/Mage.Sets/src/mage/cards/p/PollenbrightWings.java +++ b/Mage.Sets/src/mage/cards/p/PollenbrightWings.java @@ -42,7 +42,7 @@ public final class PollenbrightWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/p/PoolingVenom.java b/Mage.Sets/src/mage/cards/p/PoolingVenom.java index a23f1253bcb..92a44b95604 100644 --- a/Mage.Sets/src/mage/cards/p/PoolingVenom.java +++ b/Mage.Sets/src/mage/cards/p/PoolingVenom.java @@ -33,7 +33,7 @@ public final class PoolingVenom extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land becomes tapped, its controller loses 2 life. this.addAbility(new BecomesTappedAttachedTriggeredAbility(new LoseLifeControllerAttachedEffect(2), "enchanted land")); diff --git a/Mage.Sets/src/mage/cards/p/PowerArtifact.java b/Mage.Sets/src/mage/cards/p/PowerArtifact.java index bc477661ea1..47bea01324b 100644 --- a/Mage.Sets/src/mage/cards/p/PowerArtifact.java +++ b/Mage.Sets/src/mage/cards/p/PowerArtifact.java @@ -32,7 +32,7 @@ public final class PowerArtifact extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted artifact's activated abilities cost {2} less to activate. diff --git a/Mage.Sets/src/mage/cards/p/PowerLeak.java b/Mage.Sets/src/mage/cards/p/PowerLeak.java index d6e5abf4d36..21351c4f111 100644 --- a/Mage.Sets/src/mage/cards/p/PowerLeak.java +++ b/Mage.Sets/src/mage/cards/p/PowerLeak.java @@ -35,7 +35,7 @@ public final class PowerLeak extends CardImpl { TargetPermanent auraTarget = new TargetEnchantmentPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of the upkeep of enchanted enchantment's controller, that player may pay any amount of mana. Power Leak deals 2 damage to that player. Prevent X of that damage, where X is the amount of mana that player paid this way. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PowerLeakEffect(), TargetController.CONTROLLER_ATTACHED_TO, false, true, "At the beginning of the upkeep of enchanted enchantment's controller, ")); diff --git a/Mage.Sets/src/mage/cards/p/PowerOfFire.java b/Mage.Sets/src/mage/cards/p/PowerOfFire.java index f113a1278ca..db79218c0d5 100644 --- a/Mage.Sets/src/mage/cards/p/PowerOfFire.java +++ b/Mage.Sets/src/mage/cards/p/PowerOfFire.java @@ -37,7 +37,7 @@ public final class PowerOfFire extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to any target." diff --git a/Mage.Sets/src/mage/cards/p/PowerTaint.java b/Mage.Sets/src/mage/cards/p/PowerTaint.java index 86355db3742..8b971d640b7 100644 --- a/Mage.Sets/src/mage/cards/p/PowerTaint.java +++ b/Mage.Sets/src/mage/cards/p/PowerTaint.java @@ -35,7 +35,7 @@ public final class PowerTaint extends CardImpl { TargetPermanent auraTarget = new TargetEnchantmentPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of the upkeep of enchanted enchantment's controller, that player loses 2 life unless they pay {2}. diff --git a/Mage.Sets/src/mage/cards/p/PrecipitousDrop.java b/Mage.Sets/src/mage/cards/p/PrecipitousDrop.java index b1665ca8b13..daf04fd43e1 100644 --- a/Mage.Sets/src/mage/cards/p/PrecipitousDrop.java +++ b/Mage.Sets/src/mage/cards/p/PrecipitousDrop.java @@ -34,7 +34,7 @@ public final class PrecipitousDrop extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Precipitous Drop enters the battlefield, venture into the dungeon. diff --git a/Mage.Sets/src/mage/cards/p/PredatorsGambit.java b/Mage.Sets/src/mage/cards/p/PredatorsGambit.java index c7116ad88eb..82ec368b690 100644 --- a/Mage.Sets/src/mage/cards/p/PredatorsGambit.java +++ b/Mage.Sets/src/mage/cards/p/PredatorsGambit.java @@ -33,7 +33,7 @@ public final class PredatorsGambit extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1. diff --git a/Mage.Sets/src/mage/cards/p/PredatoryHunger.java b/Mage.Sets/src/mage/cards/p/PredatoryHunger.java index cedeebe4068..9f994b62ad8 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryHunger.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryHunger.java @@ -32,7 +32,7 @@ public final class PredatoryHunger extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever an opponent casts a creature spell, put a +1/+1 counter on enchanted creature. diff --git a/Mage.Sets/src/mage/cards/p/PredatoryImpetus.java b/Mage.Sets/src/mage/cards/p/PredatoryImpetus.java index 101fa288773..c7654424358 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryImpetus.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryImpetus.java @@ -34,7 +34,7 @@ public final class PredatoryImpetus extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3, must be blocked if able, and is goaded. diff --git a/Mage.Sets/src/mage/cards/p/PredatoryUrge.java b/Mage.Sets/src/mage/cards/p/PredatoryUrge.java index 96e6add83c1..4bab2a4ae5f 100644 --- a/Mage.Sets/src/mage/cards/p/PredatoryUrge.java +++ b/Mage.Sets/src/mage/cards/p/PredatoryUrge.java @@ -36,7 +36,7 @@ public final class PredatoryUrge extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals damage equal to its power to target creature. // That creature deals damage equal to its power to this creature." diff --git a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java index d3b4c0a294e..e6e064a808c 100644 --- a/Mage.Sets/src/mage/cards/p/PresenceOfGond.java +++ b/Mage.Sets/src/mage/cards/p/PresenceOfGond.java @@ -31,7 +31,7 @@ public final class PresenceOfGond extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: Create a 1/1 green Elf Warrior creature token." diff --git a/Mage.Sets/src/mage/cards/p/PretendersClaim.java b/Mage.Sets/src/mage/cards/p/PretendersClaim.java index be07c8d3a4d..ff9de46b536 100644 --- a/Mage.Sets/src/mage/cards/p/PretendersClaim.java +++ b/Mage.Sets/src/mage/cards/p/PretendersClaim.java @@ -26,7 +26,7 @@ public final class PretendersClaim extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature becomes blocked, tap all lands defending player controls. this.addAbility(new BecomesBlockedAttachedTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/p/PrimalCocoon.java b/Mage.Sets/src/mage/cards/p/PrimalCocoon.java index 06da7c76995..ec8a866c58f 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalCocoon.java +++ b/Mage.Sets/src/mage/cards/p/PrimalCocoon.java @@ -36,7 +36,7 @@ public final class PrimalCocoon extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new PrimalCocoonAbility1()); this.addAbility(new PrimalCocoonAbility2()); diff --git a/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java b/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java index 358fd3e9ab3..ad4d645669c 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java +++ b/Mage.Sets/src/mage/cards/p/PrimalFrenzy.java @@ -33,7 +33,7 @@ public final class PrimalFrenzy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has trample. diff --git a/Mage.Sets/src/mage/cards/p/PrimalVisitation.java b/Mage.Sets/src/mage/cards/p/PrimalVisitation.java index c75e0c36ac2..fae90374664 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalVisitation.java +++ b/Mage.Sets/src/mage/cards/p/PrimalVisitation.java @@ -35,7 +35,7 @@ public final class PrimalVisitation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and has haste. diff --git a/Mage.Sets/src/mage/cards/p/PrismaticWard.java b/Mage.Sets/src/mage/cards/p/PrismaticWard.java index 1e8238f5b40..f29252221c6 100644 --- a/Mage.Sets/src/mage/cards/p/PrismaticWard.java +++ b/Mage.Sets/src/mage/cards/p/PrismaticWard.java @@ -39,7 +39,7 @@ public final class PrismaticWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As Prismatic Ward enters the battlefield, choose a color. diff --git a/Mage.Sets/src/mage/cards/p/PrisonTerm.java b/Mage.Sets/src/mage/cards/p/PrisonTerm.java index 5b01a1e282b..18fa108130a 100644 --- a/Mage.Sets/src/mage/cards/p/PrisonTerm.java +++ b/Mage.Sets/src/mage/cards/p/PrisonTerm.java @@ -46,7 +46,7 @@ public final class PrisonTerm extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/p/PrivateResearch.java b/Mage.Sets/src/mage/cards/p/PrivateResearch.java index 58c5109ca78..182a91b7268 100644 --- a/Mage.Sets/src/mage/cards/p/PrivateResearch.java +++ b/Mage.Sets/src/mage/cards/p/PrivateResearch.java @@ -37,7 +37,7 @@ public final class PrivateResearch extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, you may put a page counter on Private Research. diff --git a/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java b/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java index c4c708f3392..d545bc70ff4 100644 --- a/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java +++ b/Mage.Sets/src/mage/cards/p/ProdigiousGrowth.java @@ -34,7 +34,7 @@ public final class ProdigiousGrowth extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +7/+7 and has trample. diff --git a/Mage.Sets/src/mage/cards/p/PropheticRavings.java b/Mage.Sets/src/mage/cards/p/PropheticRavings.java index 35d2d698516..e8562c7130c 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticRavings.java +++ b/Mage.Sets/src/mage/cards/p/PropheticRavings.java @@ -37,7 +37,7 @@ public final class PropheticRavings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has haste and "{T}, Discard a card: Draw a card." diff --git a/Mage.Sets/src/mage/cards/p/ProtectiveBubble.java b/Mage.Sets/src/mage/cards/p/ProtectiveBubble.java index 9e590f3b0e6..978e3180777 100644 --- a/Mage.Sets/src/mage/cards/p/ProtectiveBubble.java +++ b/Mage.Sets/src/mage/cards/p/ProtectiveBubble.java @@ -31,7 +31,7 @@ public final class ProtectiveBubble extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't be blocked and has shroud. Ability ability = new SimpleStaticAbility(new CantBeBlockedAttachedEffect(AttachmentType.AURA)); diff --git a/Mage.Sets/src/mage/cards/p/PsionicGift.java b/Mage.Sets/src/mage/cards/p/PsionicGift.java index 3333affb40a..36064d5910d 100644 --- a/Mage.Sets/src/mage/cards/p/PsionicGift.java +++ b/Mage.Sets/src/mage/cards/p/PsionicGift.java @@ -36,7 +36,7 @@ public final class PsionicGift extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to any target." diff --git a/Mage.Sets/src/mage/cards/p/PsychicImpetus.java b/Mage.Sets/src/mage/cards/p/PsychicImpetus.java index 0c477f1680e..de0307f7b7d 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicImpetus.java +++ b/Mage.Sets/src/mage/cards/p/PsychicImpetus.java @@ -33,7 +33,7 @@ public final class PsychicImpetus extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and is goaded. diff --git a/Mage.Sets/src/mage/cards/p/PsychicOverload.java b/Mage.Sets/src/mage/cards/p/PsychicOverload.java index 688b9e393f0..52dda32403c 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicOverload.java +++ b/Mage.Sets/src/mage/cards/p/PsychicOverload.java @@ -40,7 +40,7 @@ public final class PsychicOverload extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Psychic Overload enters the battlefield, tap enchanted permanent. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/p/PsychicPossession.java b/Mage.Sets/src/mage/cards/p/PsychicPossession.java index 314e78f04b2..93cdd1f2015 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicPossession.java +++ b/Mage.Sets/src/mage/cards/p/PsychicPossession.java @@ -37,7 +37,7 @@ public final class PsychicPossession extends CardImpl { TargetPlayer auraTarget = new TargetOpponent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Skip your draw step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect())); diff --git a/Mage.Sets/src/mage/cards/p/PsychicVenom.java b/Mage.Sets/src/mage/cards/p/PsychicVenom.java index 4e439c97086..e8c1ffcdc1f 100644 --- a/Mage.Sets/src/mage/cards/p/PsychicVenom.java +++ b/Mage.Sets/src/mage/cards/p/PsychicVenom.java @@ -32,7 +32,7 @@ public final class PsychicVenom extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land becomes tapped, Psychic Venom deals 2 damage to that land's controller. Effect effect = new DamageAttachedControllerEffect(2); diff --git a/Mage.Sets/src/mage/cards/p/PublicEnemy.java b/Mage.Sets/src/mage/cards/p/PublicEnemy.java index 0d7c675a0ed..217cce56b67 100644 --- a/Mage.Sets/src/mage/cards/p/PublicEnemy.java +++ b/Mage.Sets/src/mage/cards/p/PublicEnemy.java @@ -36,7 +36,7 @@ public final class PublicEnemy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // All creatures attack enchanted creature's controller each combat if able. this.addAbility(new SimpleStaticAbility(new PublicEnemyEffect())); diff --git a/Mage.Sets/src/mage/cards/p/PuppetMaster.java b/Mage.Sets/src/mage/cards/p/PuppetMaster.java index cf2076b74f5..fef7c930484 100644 --- a/Mage.Sets/src/mage/cards/p/PuppetMaster.java +++ b/Mage.Sets/src/mage/cards/p/PuppetMaster.java @@ -35,7 +35,7 @@ public final class PuppetMaster extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, return that card to its owner's hand. If that card is returned to its owner’s hand this way, you may pay {U}{U}{U}. If you do, return Puppet Master to its owner’s hand. diff --git a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java index 3d622c12405..00ef7723637 100644 --- a/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java +++ b/Mage.Sets/src/mage/cards/p/PursuitOfFlight.java @@ -36,7 +36,7 @@ public final class PursuitOfFlight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{U}: This creature gains flying until end of turn." @@ -53,4 +53,4 @@ public final class PursuitOfFlight extends CardImpl { public PursuitOfFlight copy() { return new PursuitOfFlight(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/q/QuagSickness.java b/Mage.Sets/src/mage/cards/q/QuagSickness.java index b75f2cc6917..9868ad4445e 100644 --- a/Mage.Sets/src/mage/cards/q/QuagSickness.java +++ b/Mage.Sets/src/mage/cards/q/QuagSickness.java @@ -36,7 +36,7 @@ public final class QuagSickness extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, -1); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(amount, amount, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java index b10eb7c2aff..2a18f339195 100644 --- a/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java +++ b/Mage.Sets/src/mage/cards/q/QuicksilverDagger.java @@ -37,7 +37,7 @@ public final class QuicksilverDagger extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals 1 damage to target player. You draw a card." diff --git a/Mage.Sets/src/mage/cards/q/QuietDisrepair.java b/Mage.Sets/src/mage/cards/q/QuietDisrepair.java index 55dddf5eadc..0d4cfc8cc48 100644 --- a/Mage.Sets/src/mage/cards/q/QuietDisrepair.java +++ b/Mage.Sets/src/mage/cards/q/QuietDisrepair.java @@ -34,7 +34,7 @@ public final class QuietDisrepair extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, choose one - Destroy enchanted permanent; or you gain 2 life. diff --git a/Mage.Sets/src/mage/cards/r/RacecourseFury.java b/Mage.Sets/src/mage/cards/r/RacecourseFury.java index c2c0c9af0c3..fb1116d13f9 100644 --- a/Mage.Sets/src/mage/cards/r/RacecourseFury.java +++ b/Mage.Sets/src/mage/cards/r/RacecourseFury.java @@ -41,7 +41,7 @@ public final class RacecourseFury extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Target creature gains haste until end of turn." diff --git a/Mage.Sets/src/mage/cards/r/RadiantGrace.java b/Mage.Sets/src/mage/cards/r/RadiantGrace.java index ec94edc67b2..063986bb4aa 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantGrace.java +++ b/Mage.Sets/src/mage/cards/r/RadiantGrace.java @@ -37,7 +37,7 @@ public final class RadiantGrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+0 and has vigilance. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect(1, 0)); diff --git a/Mage.Sets/src/mage/cards/r/RadiantRestraints.java b/Mage.Sets/src/mage/cards/r/RadiantRestraints.java index 14edb9dbc12..9fa133903b2 100644 --- a/Mage.Sets/src/mage/cards/r/RadiantRestraints.java +++ b/Mage.Sets/src/mage/cards/r/RadiantRestraints.java @@ -39,7 +39,7 @@ public final class RadiantRestraints extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Creatures enchanted player controls enter the battlefield tapped. this.addAbility(new SimpleStaticAbility(new PermanentsEnterBattlefieldTappedEffect(filter))); diff --git a/Mage.Sets/src/mage/cards/r/RaffinesGuidance.java b/Mage.Sets/src/mage/cards/r/RaffinesGuidance.java index df67ecd5b26..795fbb58511 100644 --- a/Mage.Sets/src/mage/cards/r/RaffinesGuidance.java +++ b/Mage.Sets/src/mage/cards/r/RaffinesGuidance.java @@ -33,7 +33,7 @@ public final class RaffinesGuidance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/r/RaggedVeins.java b/Mage.Sets/src/mage/cards/r/RaggedVeins.java index 8af532872e7..a468b0cd46f 100644 --- a/Mage.Sets/src/mage/cards/r/RaggedVeins.java +++ b/Mage.Sets/src/mage/cards/r/RaggedVeins.java @@ -32,7 +32,7 @@ public final class RaggedVeins extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature is dealt damage, its controller loses that much life. this.addAbility(new DealtDamageAttachedTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/r/RaisedByWolves.java b/Mage.Sets/src/mage/cards/r/RaisedByWolves.java index fec27889b60..18f02082dac 100644 --- a/Mage.Sets/src/mage/cards/r/RaisedByWolves.java +++ b/Mage.Sets/src/mage/cards/r/RaisedByWolves.java @@ -40,7 +40,7 @@ public final class RaisedByWolves extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Raised by Wolves enters the battlefield, create two 2/2 green Wolf creature tokens. diff --git a/Mage.Sets/src/mage/cards/r/Rancor.java b/Mage.Sets/src/mage/cards/r/Rancor.java index 7a938e4f8ca..52ac1fb40ca 100644 --- a/Mage.Sets/src/mage/cards/r/Rancor.java +++ b/Mage.Sets/src/mage/cards/r/Rancor.java @@ -32,7 +32,7 @@ public final class Rancor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0 and has trample. diff --git a/Mage.Sets/src/mage/cards/r/RayOfFrost.java b/Mage.Sets/src/mage/cards/r/RayOfFrost.java index 79d53f6bc0e..555269fb4c5 100644 --- a/Mage.Sets/src/mage/cards/r/RayOfFrost.java +++ b/Mage.Sets/src/mage/cards/r/RayOfFrost.java @@ -39,7 +39,7 @@ public final class RayOfFrost extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Ray of Frost enters the battlefield, if enchanted creature is red, tap it. diff --git a/Mage.Sets/src/mage/cards/r/RealityAcid.java b/Mage.Sets/src/mage/cards/r/RealityAcid.java index fb5e80addee..e1e38c3dc82 100644 --- a/Mage.Sets/src/mage/cards/r/RealityAcid.java +++ b/Mage.Sets/src/mage/cards/r/RealityAcid.java @@ -39,7 +39,7 @@ public final class RealityAcid extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Vanishing 3 diff --git a/Mage.Sets/src/mage/cards/r/RecumbentBliss.java b/Mage.Sets/src/mage/cards/r/RecumbentBliss.java index c6b247d3c2a..98c95c0d5a7 100644 --- a/Mage.Sets/src/mage/cards/r/RecumbentBliss.java +++ b/Mage.Sets/src/mage/cards/r/RecumbentBliss.java @@ -29,7 +29,7 @@ public final class RecumbentBliss extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new RecumbentBlissEffect())); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(1), TargetController.YOU, true)); diff --git a/Mage.Sets/src/mage/cards/r/RedScarab.java b/Mage.Sets/src/mage/cards/r/RedScarab.java index 094eb56caaa..610f5777c1b 100644 --- a/Mage.Sets/src/mage/cards/r/RedScarab.java +++ b/Mage.Sets/src/mage/cards/r/RedScarab.java @@ -48,7 +48,7 @@ public final class RedScarab extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked by red creatures. diff --git a/Mage.Sets/src/mage/cards/r/RedWard.java b/Mage.Sets/src/mage/cards/r/RedWard.java index 7e789ea4185..190629ea1e2 100644 --- a/Mage.Sets/src/mage/cards/r/RedWard.java +++ b/Mage.Sets/src/mage/cards/r/RedWard.java @@ -30,7 +30,7 @@ public final class RedWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( ProtectionAbility.from(ObjectColor.RED), AttachmentType.AURA diff --git a/Mage.Sets/src/mage/cards/r/ReduceInStature.java b/Mage.Sets/src/mage/cards/r/ReduceInStature.java index f1018014521..2c41bcd6445 100644 --- a/Mage.Sets/src/mage/cards/r/ReduceInStature.java +++ b/Mage.Sets/src/mage/cards/r/ReduceInStature.java @@ -30,7 +30,7 @@ public final class ReduceInStature extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has base power and toughness 0/2. diff --git a/Mage.Sets/src/mage/cards/r/Reflexes.java b/Mage.Sets/src/mage/cards/r/Reflexes.java index ef14923e439..3a97e5ba3a2 100644 --- a/Mage.Sets/src/mage/cards/r/Reflexes.java +++ b/Mage.Sets/src/mage/cards/r/Reflexes.java @@ -29,7 +29,7 @@ public final class Reflexes extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has first strike. diff --git a/Mage.Sets/src/mage/cards/r/Regeneration.java b/Mage.Sets/src/mage/cards/r/Regeneration.java index 366e6f000eb..bc6e1e5b8a0 100644 --- a/Mage.Sets/src/mage/cards/r/Regeneration.java +++ b/Mage.Sets/src/mage/cards/r/Regeneration.java @@ -27,7 +27,7 @@ public final class Regeneration extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {G}: Regenerate enchanted creature. diff --git a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java index a3ab0474701..6b656589efc 100644 --- a/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java +++ b/Mage.Sets/src/mage/cards/r/ReinsOfTheVinesteed.java @@ -35,7 +35,7 @@ public final class ReinsOfTheVinesteed extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/r/RelicBane.java b/Mage.Sets/src/mage/cards/r/RelicBane.java index 9d2972875da..fa5bcc06c94 100644 --- a/Mage.Sets/src/mage/cards/r/RelicBane.java +++ b/Mage.Sets/src/mage/cards/r/RelicBane.java @@ -33,7 +33,7 @@ public final class RelicBane extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted artifact has "At the beginning of your upkeep, you lose 2 life." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect( new BeginningOfUpkeepTriggeredAbility(new LoseLifeSourceControllerEffect(2), diff --git a/Mage.Sets/src/mage/cards/r/RelicBind.java b/Mage.Sets/src/mage/cards/r/RelicBind.java index c3e5d39a6f0..acc4428e587 100644 --- a/Mage.Sets/src/mage/cards/r/RelicBind.java +++ b/Mage.Sets/src/mage/cards/r/RelicBind.java @@ -40,7 +40,7 @@ public final class RelicBind extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted artifact becomes tapped, choose one diff --git a/Mage.Sets/src/mage/cards/r/RelicPutrescence.java b/Mage.Sets/src/mage/cards/r/RelicPutrescence.java index 6bbbcac401c..e5c86ad5666 100644 --- a/Mage.Sets/src/mage/cards/r/RelicPutrescence.java +++ b/Mage.Sets/src/mage/cards/r/RelicPutrescence.java @@ -35,7 +35,7 @@ public final class RelicPutrescence extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new RelicPutrescenceAbility()); } diff --git a/Mage.Sets/src/mage/cards/r/RelicWard.java b/Mage.Sets/src/mage/cards/r/RelicWard.java index 415aa9a77b8..9e747bb992d 100644 --- a/Mage.Sets/src/mage/cards/r/RelicWard.java +++ b/Mage.Sets/src/mage/cards/r/RelicWard.java @@ -37,7 +37,7 @@ public final class RelicWard extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted artifact has shroud. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/r/Reprobation.java b/Mage.Sets/src/mage/cards/r/Reprobation.java index e678e35992e..fc7ea4a2be5 100644 --- a/Mage.Sets/src/mage/cards/r/Reprobation.java +++ b/Mage.Sets/src/mage/cards/r/Reprobation.java @@ -32,7 +32,7 @@ public final class Reprobation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature loses all abilities and is a Coward creature with base power and toughness 0/1. diff --git a/Mage.Sets/src/mage/cards/r/RevokePrivileges.java b/Mage.Sets/src/mage/cards/r/RevokePrivileges.java index b92a7095d47..bbfcbb861ee 100644 --- a/Mage.Sets/src/mage/cards/r/RevokePrivileges.java +++ b/Mage.Sets/src/mage/cards/r/RevokePrivileges.java @@ -39,7 +39,7 @@ public final class RevokePrivileges extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack, block, or crew Vehicles. diff --git a/Mage.Sets/src/mage/cards/r/RighteousAuthority.java b/Mage.Sets/src/mage/cards/r/RighteousAuthority.java index 470691c3de2..f18d616596e 100644 --- a/Mage.Sets/src/mage/cards/r/RighteousAuthority.java +++ b/Mage.Sets/src/mage/cards/r/RighteousAuthority.java @@ -36,7 +36,7 @@ public final class RighteousAuthority extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 for each card in its controller's hand. diff --git a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java index a3b4186e783..076d488d818 100644 --- a/Mage.Sets/src/mage/cards/r/RimeTransfusion.java +++ b/Mage.Sets/src/mage/cards/r/RimeTransfusion.java @@ -44,7 +44,7 @@ public final class RimeTransfusion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1 and has "{S}: This creature can't be blocked this turn except by snow creatures." diff --git a/Mage.Sets/src/mage/cards/r/RiotSpikes.java b/Mage.Sets/src/mage/cards/r/RiotSpikes.java index 11f33089b7a..a14d3828272 100644 --- a/Mage.Sets/src/mage/cards/r/RiotSpikes.java +++ b/Mage.Sets/src/mage/cards/r/RiotSpikes.java @@ -27,7 +27,7 @@ public final class RiotSpikes extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, -1, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/r/RitualOfSteel.java b/Mage.Sets/src/mage/cards/r/RitualOfSteel.java index 9e19de0457d..914cf1012ec 100644 --- a/Mage.Sets/src/mage/cards/r/RitualOfSteel.java +++ b/Mage.Sets/src/mage/cards/r/RitualOfSteel.java @@ -35,7 +35,7 @@ public final class RitualOfSteel extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Ritual of Steel enters the battlefield, draw a card at the beginning of the next turn's upkeep. diff --git a/Mage.Sets/src/mage/cards/r/RiversFavor.java b/Mage.Sets/src/mage/cards/r/RiversFavor.java index 03dc0965a47..ca49fa065c8 100644 --- a/Mage.Sets/src/mage/cards/r/RiversFavor.java +++ b/Mage.Sets/src/mage/cards/r/RiversFavor.java @@ -29,7 +29,7 @@ public final class RiversFavor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. @@ -44,4 +44,4 @@ public final class RiversFavor extends CardImpl { public RiversFavor copy() { return new RiversFavor(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/r/RobeOfMirrors.java b/Mage.Sets/src/mage/cards/r/RobeOfMirrors.java index 5d5ada8b95c..f3f527d1e34 100644 --- a/Mage.Sets/src/mage/cards/r/RobeOfMirrors.java +++ b/Mage.Sets/src/mage/cards/r/RobeOfMirrors.java @@ -29,7 +29,7 @@ public final class RobeOfMirrors extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shroud. diff --git a/Mage.Sets/src/mage/cards/r/Roots.java b/Mage.Sets/src/mage/cards/r/Roots.java index 29a2f36856b..46ce4548ccc 100644 --- a/Mage.Sets/src/mage/cards/r/Roots.java +++ b/Mage.Sets/src/mage/cards/r/Roots.java @@ -41,7 +41,7 @@ public final class Roots extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Roots enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/r/RousingRead.java b/Mage.Sets/src/mage/cards/r/RousingRead.java index 80646faf206..5e9bb1b2fc5 100644 --- a/Mage.Sets/src/mage/cards/r/RousingRead.java +++ b/Mage.Sets/src/mage/cards/r/RousingRead.java @@ -31,7 +31,7 @@ public final class RousingRead extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Rousing Read enters the battlefield, draw two cards, then discard a card. diff --git a/Mage.Sets/src/mage/cards/r/RuneOfFlight.java b/Mage.Sets/src/mage/cards/r/RuneOfFlight.java index 616d4df5ef3..d6e3ae8f94c 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfFlight.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfFlight.java @@ -40,7 +40,7 @@ public final class RuneOfFlight extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Rune of Flight enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/r/RuneOfMight.java b/Mage.Sets/src/mage/cards/r/RuneOfMight.java index d1a7295659c..b494b35f40c 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfMight.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfMight.java @@ -41,7 +41,7 @@ public final class RuneOfMight extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Rune of Might enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/r/RuneOfMortality.java b/Mage.Sets/src/mage/cards/r/RuneOfMortality.java index 4b5a7167923..3c728338df6 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfMortality.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfMortality.java @@ -40,7 +40,7 @@ public final class RuneOfMortality extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Rune of Mortality enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/r/RuneOfSpeed.java b/Mage.Sets/src/mage/cards/r/RuneOfSpeed.java index 3742ca22d4d..ff6959b874f 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfSpeed.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfSpeed.java @@ -41,7 +41,7 @@ public final class RuneOfSpeed extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Rune of Speed enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/r/RuneOfSustenance.java b/Mage.Sets/src/mage/cards/r/RuneOfSustenance.java index 670c383df6d..8ac7ca06c64 100644 --- a/Mage.Sets/src/mage/cards/r/RuneOfSustenance.java +++ b/Mage.Sets/src/mage/cards/r/RuneOfSustenance.java @@ -40,7 +40,7 @@ public final class RuneOfSustenance extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Rune of Sustenance enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/r/RunesOfTheDeus.java b/Mage.Sets/src/mage/cards/r/RunesOfTheDeus.java index 965b72547e7..ccc416c7f40 100644 --- a/Mage.Sets/src/mage/cards/r/RunesOfTheDeus.java +++ b/Mage.Sets/src/mage/cards/r/RunesOfTheDeus.java @@ -38,7 +38,7 @@ public final class RunesOfTheDeus extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is red, it gets +1/+1 and has double strike. SimpleStaticAbility redAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.RED), "As long as enchanted creature is red, it gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/r/RunnersBane.java b/Mage.Sets/src/mage/cards/r/RunnersBane.java index 4a1c5978510..4cc6df5fef5 100644 --- a/Mage.Sets/src/mage/cards/r/RunnersBane.java +++ b/Mage.Sets/src/mage/cards/r/RunnersBane.java @@ -40,7 +40,7 @@ public final class RunnersBane extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Runner's Bane enters the battlefield, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/s/SadisticGlee.java b/Mage.Sets/src/mage/cards/s/SadisticGlee.java index 8e32e2ca7ea..6a3668d431b 100644 --- a/Mage.Sets/src/mage/cards/s/SadisticGlee.java +++ b/Mage.Sets/src/mage/cards/s/SadisticGlee.java @@ -30,7 +30,7 @@ public final class SadisticGlee extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever a creature dies, put a +1/+1 counter on enchanted creature. this.addAbility(new DiesCreatureTriggeredAbility(new AddCountersAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/s/SadisticObsession.java b/Mage.Sets/src/mage/cards/s/SadisticObsession.java index 32026530461..1cbdbf00c38 100644 --- a/Mage.Sets/src/mage/cards/s/SadisticObsession.java +++ b/Mage.Sets/src/mage/cards/s/SadisticObsession.java @@ -32,7 +32,7 @@ public final class SadisticObsession extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{B}, {T}: Put a -1/-1 counter on target creature." diff --git a/Mage.Sets/src/mage/cards/s/SagesReverie.java b/Mage.Sets/src/mage/cards/s/SagesReverie.java index 337ec7a5876..280baed9ec0 100644 --- a/Mage.Sets/src/mage/cards/s/SagesReverie.java +++ b/Mage.Sets/src/mage/cards/s/SagesReverie.java @@ -43,7 +43,7 @@ public final class SagesReverie extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Sage's Reverie enters the battlefield, draw a card for each aura you control that's attached to a creature. diff --git a/Mage.Sets/src/mage/cards/s/SamiteBlessing.java b/Mage.Sets/src/mage/cards/s/SamiteBlessing.java index da1729b3076..f69dd82b500 100644 --- a/Mage.Sets/src/mage/cards/s/SamiteBlessing.java +++ b/Mage.Sets/src/mage/cards/s/SamiteBlessing.java @@ -37,7 +37,7 @@ public final class SamiteBlessing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: The next time a source of your choice would deal damage to target creature this turn, prevent that damage." diff --git a/Mage.Sets/src/mage/cards/s/Sandskin.java b/Mage.Sets/src/mage/cards/s/Sandskin.java index 9241c413d30..77d17c5cb3e 100644 --- a/Mage.Sets/src/mage/cards/s/Sandskin.java +++ b/Mage.Sets/src/mage/cards/s/Sandskin.java @@ -30,7 +30,7 @@ public final class Sandskin extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Prevent all combat damage that would be dealt to and dealt by enchanted creature. diff --git a/Mage.Sets/src/mage/cards/s/SangriteBacklash.java b/Mage.Sets/src/mage/cards/s/SangriteBacklash.java index cce8d0afd2a..0a0ee1760d3 100644 --- a/Mage.Sets/src/mage/cards/s/SangriteBacklash.java +++ b/Mage.Sets/src/mage/cards/s/SangriteBacklash.java @@ -34,7 +34,7 @@ public final class SangriteBacklash extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/-3. diff --git a/Mage.Sets/src/mage/cards/s/SavageHunger.java b/Mage.Sets/src/mage/cards/s/SavageHunger.java index db5d02bc21f..990a4903456 100644 --- a/Mage.Sets/src/mage/cards/s/SavageHunger.java +++ b/Mage.Sets/src/mage/cards/s/SavageHunger.java @@ -30,7 +30,7 @@ public final class SavageHunger extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( 1, 0, Duration.WhileOnBattlefield diff --git a/Mage.Sets/src/mage/cards/s/SavageSilhouette.java b/Mage.Sets/src/mage/cards/s/SavageSilhouette.java index a46ce3a4167..96e3e6d5d33 100644 --- a/Mage.Sets/src/mage/cards/s/SavageSilhouette.java +++ b/Mage.Sets/src/mage/cards/s/SavageSilhouette.java @@ -30,7 +30,7 @@ public final class SavageSilhouette extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+2 and has "{1}{G}: Regenerate this creature." Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/s/SavingGrace.java b/Mage.Sets/src/mage/cards/s/SavingGrace.java index 741e49f40c8..3f6c721b993 100644 --- a/Mage.Sets/src/mage/cards/s/SavingGrace.java +++ b/Mage.Sets/src/mage/cards/s/SavingGrace.java @@ -43,7 +43,7 @@ public final class SavingGrace extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Saving Grace enters the battlefield, all damage that would be dealt this turn to you and permanents you control is dealt to enchanted creature instead. diff --git a/Mage.Sets/src/mage/cards/s/ScavengedWeaponry.java b/Mage.Sets/src/mage/cards/s/ScavengedWeaponry.java index a9d168712ec..c192e2a82ea 100644 --- a/Mage.Sets/src/mage/cards/s/ScavengedWeaponry.java +++ b/Mage.Sets/src/mage/cards/s/ScavengedWeaponry.java @@ -33,7 +33,7 @@ public final class ScavengedWeaponry extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Scavenged Weaponry enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java b/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java index 1f6de4fb597..1a6393f3759 100644 --- a/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java +++ b/Mage.Sets/src/mage/cards/s/ScourgeOfTheNobilis.java @@ -35,7 +35,7 @@ public final class ScourgeOfTheNobilis extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is red, it gets +1/+1 and has "{RW}: This creature gets +1/+0 until end of turn." diff --git a/Mage.Sets/src/mage/cards/s/Scourgemark.java b/Mage.Sets/src/mage/cards/s/Scourgemark.java index d8e0574d0df..817dabb9ae6 100644 --- a/Mage.Sets/src/mage/cards/s/Scourgemark.java +++ b/Mage.Sets/src/mage/cards/s/Scourgemark.java @@ -34,7 +34,7 @@ public final class Scourgemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Scourgemark enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/s/ScreamsFromWithin.java b/Mage.Sets/src/mage/cards/s/ScreamsFromWithin.java index 3376b6a4003..87943c41bd5 100644 --- a/Mage.Sets/src/mage/cards/s/ScreamsFromWithin.java +++ b/Mage.Sets/src/mage/cards/s/ScreamsFromWithin.java @@ -39,7 +39,7 @@ public final class ScreamsFromWithin extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -1/-1. diff --git a/Mage.Sets/src/mage/cards/s/SeaLegs.java b/Mage.Sets/src/mage/cards/s/SeaLegs.java index e52e71db783..69ae710badb 100644 --- a/Mage.Sets/src/mage/cards/s/SeaLegs.java +++ b/Mage.Sets/src/mage/cards/s/SeaLegs.java @@ -37,7 +37,7 @@ public final class SeaLegs extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2 as long as it's a Pirate. Otherwise, it gets -2/-0. diff --git a/Mage.Sets/src/mage/cards/s/SeasClaim.java b/Mage.Sets/src/mage/cards/s/SeasClaim.java index 4a22834667b..dc4439b59a3 100644 --- a/Mage.Sets/src/mage/cards/s/SeasClaim.java +++ b/Mage.Sets/src/mage/cards/s/SeasClaim.java @@ -32,7 +32,7 @@ public final class SeasClaim extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land is an Island. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesBasicLandEnchantedEffect(SubType.ISLAND))); diff --git a/Mage.Sets/src/mage/cards/s/SecondWind.java b/Mage.Sets/src/mage/cards/s/SecondWind.java index 9c204c18cb9..dfbcd802e10 100644 --- a/Mage.Sets/src/mage/cards/s/SecondWind.java +++ b/Mage.Sets/src/mage/cards/s/SecondWind.java @@ -31,7 +31,7 @@ public final class SecondWind extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Untap)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // {tap}: Tap enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapEnchantedEffect(), new TapSourceCost())); diff --git a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java index 4434679068c..d411a072b66 100644 --- a/Mage.Sets/src/mage/cards/s/SecurityBlockade.java +++ b/Mage.Sets/src/mage/cards/s/SecurityBlockade.java @@ -41,7 +41,7 @@ public final class SecurityBlockade extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Security Blockade enters the battlefield, create a 2/2 white Knight creature token with vigilance. diff --git a/Mage.Sets/src/mage/cards/s/SecurityBypass.java b/Mage.Sets/src/mage/cards/s/SecurityBypass.java index 161dd0119ec..17dcf43f05f 100644 --- a/Mage.Sets/src/mage/cards/s/SecurityBypass.java +++ b/Mage.Sets/src/mage/cards/s/SecurityBypass.java @@ -34,7 +34,7 @@ public final class SecurityBypass extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted creature is attacking alone, it can't be blocked. this.addAbility(new SimpleStaticAbility(new ConditionalRestrictionEffect( diff --git a/Mage.Sets/src/mage/cards/s/SeeRed.java b/Mage.Sets/src/mage/cards/s/SeeRed.java index 72c1cfa0253..09732734f03 100644 --- a/Mage.Sets/src/mage/cards/s/SeeRed.java +++ b/Mage.Sets/src/mage/cards/s/SeeRed.java @@ -43,7 +43,7 @@ public final class SeeRed extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1 and has first strike. diff --git a/Mage.Sets/src/mage/cards/s/Seeker.java b/Mage.Sets/src/mage/cards/s/Seeker.java index 43224f23f05..a1d0f993ec5 100644 --- a/Mage.Sets/src/mage/cards/s/Seeker.java +++ b/Mage.Sets/src/mage/cards/s/Seeker.java @@ -45,7 +45,7 @@ public final class Seeker extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked except by artifact creatures and/or white creatures. diff --git a/Mage.Sets/src/mage/cards/s/Seizures.java b/Mage.Sets/src/mage/cards/s/Seizures.java index 30fdbcfb7f7..546cdc63717 100644 --- a/Mage.Sets/src/mage/cards/s/Seizures.java +++ b/Mage.Sets/src/mage/cards/s/Seizures.java @@ -34,7 +34,7 @@ public final class Seizures extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature becomes tapped, Seizures deals 3 damage to that creature's controller unless that player pays {3}. this.addAbility(new BecomesTappedAttachedTriggeredAbility(new SeizuresEffect(), "enchanted creature")); diff --git a/Mage.Sets/src/mage/cards/s/SenselessRage.java b/Mage.Sets/src/mage/cards/s/SenselessRage.java index 202469dc204..49471defebf 100644 --- a/Mage.Sets/src/mage/cards/s/SenselessRage.java +++ b/Mage.Sets/src/mage/cards/s/SenselessRage.java @@ -33,7 +33,7 @@ public final class SenselessRage extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/s/SensoryDeprivation.java b/Mage.Sets/src/mage/cards/s/SensoryDeprivation.java index 9f60c4aa7b5..ce088cef5f5 100644 --- a/Mage.Sets/src/mage/cards/s/SensoryDeprivation.java +++ b/Mage.Sets/src/mage/cards/s/SensoryDeprivation.java @@ -31,7 +31,7 @@ public final class SensoryDeprivation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets -3/-0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/s/SentinelsEyes.java b/Mage.Sets/src/mage/cards/s/SentinelsEyes.java index 84c3a0ff12a..aefb8522f88 100644 --- a/Mage.Sets/src/mage/cards/s/SentinelsEyes.java +++ b/Mage.Sets/src/mage/cards/s/SentinelsEyes.java @@ -33,7 +33,7 @@ public final class SentinelsEyes extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has vigilance. diff --git a/Mage.Sets/src/mage/cards/s/SentinelsMark.java b/Mage.Sets/src/mage/cards/s/SentinelsMark.java index d22a0487adc..c7d4e0a8eef 100644 --- a/Mage.Sets/src/mage/cards/s/SentinelsMark.java +++ b/Mage.Sets/src/mage/cards/s/SentinelsMark.java @@ -37,7 +37,7 @@ public final class SentinelsMark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2 and has vigilance. diff --git a/Mage.Sets/src/mage/cards/s/SerpentSkin.java b/Mage.Sets/src/mage/cards/s/SerpentSkin.java index 4f78a9cddc5..4842ebf6593 100644 --- a/Mage.Sets/src/mage/cards/s/SerpentSkin.java +++ b/Mage.Sets/src/mage/cards/s/SerpentSkin.java @@ -33,7 +33,7 @@ public final class SerpentSkin extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/s/SerraBestiary.java b/Mage.Sets/src/mage/cards/s/SerraBestiary.java index 575c62697ef..32d9bd72c2f 100644 --- a/Mage.Sets/src/mage/cards/s/SerraBestiary.java +++ b/Mage.Sets/src/mage/cards/s/SerraBestiary.java @@ -41,7 +41,7 @@ public final class SerraBestiary extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Removal)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, sacrifice Serra Bestiary unless you pay {W}{W}. diff --git a/Mage.Sets/src/mage/cards/s/SerrasBoon.java b/Mage.Sets/src/mage/cards/s/SerrasBoon.java index ba7e87f354e..9d59ad87655 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasBoon.java +++ b/Mage.Sets/src/mage/cards/s/SerrasBoon.java @@ -42,7 +42,7 @@ public final class SerrasBoon extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2 as long as it's white. Otherwise, it gets -2/-1. diff --git a/Mage.Sets/src/mage/cards/s/SerrasEmbrace.java b/Mage.Sets/src/mage/cards/s/SerrasEmbrace.java index 9b4345dd314..71ba3c02997 100644 --- a/Mage.Sets/src/mage/cards/s/SerrasEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/SerrasEmbrace.java @@ -35,7 +35,7 @@ public final class SerrasEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying and vigilance. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); diff --git a/Mage.Sets/src/mage/cards/s/SetessanTraining.java b/Mage.Sets/src/mage/cards/s/SetessanTraining.java index 6b8f92adad8..4f7267aec90 100644 --- a/Mage.Sets/src/mage/cards/s/SetessanTraining.java +++ b/Mage.Sets/src/mage/cards/s/SetessanTraining.java @@ -34,7 +34,7 @@ public final class SetessanTraining extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Setessan Training enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/s/SetonsDesire.java b/Mage.Sets/src/mage/cards/s/SetonsDesire.java index 9c268102060..b6c919ba85e 100644 --- a/Mage.Sets/src/mage/cards/s/SetonsDesire.java +++ b/Mage.Sets/src/mage/cards/s/SetonsDesire.java @@ -37,7 +37,7 @@ public final class SetonsDesire extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/s/Shackles.java b/Mage.Sets/src/mage/cards/s/Shackles.java index e2e41ade34a..f45a7f1425f 100644 --- a/Mage.Sets/src/mage/cards/s/Shackles.java +++ b/Mage.Sets/src/mage/cards/s/Shackles.java @@ -34,7 +34,7 @@ public final class Shackles extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/s/ShadesForm.java b/Mage.Sets/src/mage/cards/s/ShadesForm.java index 9c525ad6e2c..54e41834b2f 100644 --- a/Mage.Sets/src/mage/cards/s/ShadesForm.java +++ b/Mage.Sets/src/mage/cards/s/ShadesForm.java @@ -34,7 +34,7 @@ public final class ShadesForm extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {B}: Enchanted creature gets +1/+1 until end of turn. diff --git a/Mage.Sets/src/mage/cards/s/ShadowLance.java b/Mage.Sets/src/mage/cards/s/ShadowLance.java index d5646f5fa2b..8102704e360 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowLance.java +++ b/Mage.Sets/src/mage/cards/s/ShadowLance.java @@ -31,7 +31,7 @@ public final class ShadowLance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(FirstStrikeAbility.getInstance(), AttachmentType.AURA))); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"))); diff --git a/Mage.Sets/src/mage/cards/s/ShapeOfTheWiitigo.java b/Mage.Sets/src/mage/cards/s/ShapeOfTheWiitigo.java index e4b73ca3879..c603ecac004 100644 --- a/Mage.Sets/src/mage/cards/s/ShapeOfTheWiitigo.java +++ b/Mage.Sets/src/mage/cards/s/ShapeOfTheWiitigo.java @@ -38,7 +38,7 @@ public final class ShapeOfTheWiitigo extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Shape of the Wiitigo enters the battlefield, put six +1/+1 counters on enchanted creature. @@ -117,4 +117,4 @@ class AttackedOrBlockedSinceYourLastUpkeepWatcher extends Watcher{ public boolean attackedSinceLastUpkeep(MageObjectReference mor, UUID upkeepPlayer){ return attackedOrBlockedCreatures.get(upkeepPlayer).contains(mor); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/ShatteredEgo.java b/Mage.Sets/src/mage/cards/s/ShatteredEgo.java index 0a9df3f3a15..22bd17b8d20 100644 --- a/Mage.Sets/src/mage/cards/s/ShatteredEgo.java +++ b/Mage.Sets/src/mage/cards/s/ShatteredEgo.java @@ -35,7 +35,7 @@ public final class ShatteredEgo extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-0. diff --git a/Mage.Sets/src/mage/cards/s/ShelteredAerie.java b/Mage.Sets/src/mage/cards/s/ShelteredAerie.java index 8c92b297e10..09572da8038 100644 --- a/Mage.Sets/src/mage/cards/s/ShelteredAerie.java +++ b/Mage.Sets/src/mage/cards/s/ShelteredAerie.java @@ -35,7 +35,7 @@ public final class ShelteredAerie extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Add two mana of any one color." diff --git a/Mage.Sets/src/mage/cards/s/ShelteringBoughs.java b/Mage.Sets/src/mage/cards/s/ShelteringBoughs.java index 29fd43d589f..bd41b737e57 100644 --- a/Mage.Sets/src/mage/cards/s/ShelteringBoughs.java +++ b/Mage.Sets/src/mage/cards/s/ShelteringBoughs.java @@ -31,7 +31,7 @@ public final class ShelteringBoughs extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Sheltering Boughs enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java b/Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java index 131fe87dca4..1bb1d4350a7 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfDutyAndReason.java @@ -34,7 +34,7 @@ public final class ShieldOfDutyAndReason extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has protection from green and from blue. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ProtectionAbility.from(ObjectColor.GREEN, ObjectColor.BLUE), diff --git a/Mage.Sets/src/mage/cards/s/ShieldOfTheOversoul.java b/Mage.Sets/src/mage/cards/s/ShieldOfTheOversoul.java index 8af2a2d6c0d..eaf1038d266 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldOfTheOversoul.java +++ b/Mage.Sets/src/mage/cards/s/ShieldOfTheOversoul.java @@ -38,7 +38,7 @@ public final class ShieldOfTheOversoul extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is green, it gets +1/+1 and is indestructible. SimpleStaticAbility greenAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.GREEN), "As long as enchanted creature is green, it gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/s/ShieldedByFaith.java b/Mage.Sets/src/mage/cards/s/ShieldedByFaith.java index 0d3514f4f6d..1ad7f8d5186 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldedByFaith.java +++ b/Mage.Sets/src/mage/cards/s/ShieldedByFaith.java @@ -36,7 +36,7 @@ public final class ShieldedByFaith extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has indestructible. Effect effect = new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), diff --git a/Mage.Sets/src/mage/cards/s/ShieldingPlax.java b/Mage.Sets/src/mage/cards/s/ShieldingPlax.java index 87aecb366e6..1e7901cf1eb 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldingPlax.java +++ b/Mage.Sets/src/mage/cards/s/ShieldingPlax.java @@ -39,7 +39,7 @@ public final class ShieldingPlax extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Shielding Plax enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/s/ShiftingShadow.java b/Mage.Sets/src/mage/cards/s/ShiftingShadow.java index 896438fd3b8..f9664cb29a0 100644 --- a/Mage.Sets/src/mage/cards/s/ShiftingShadow.java +++ b/Mage.Sets/src/mage/cards/s/ShiftingShadow.java @@ -33,7 +33,7 @@ public final class ShiftingShadow extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has haste and “At the beginning of your upkeep, destroy this creature. Reveal cards from the top of your library until you reveal a creature card. // Put that card onto the battlefield and attach Shifting Shadow to it, then put all other cards revealed this way on the bottom of your library in a random order.” diff --git a/Mage.Sets/src/mage/cards/s/ShimmeringWings.java b/Mage.Sets/src/mage/cards/s/ShimmeringWings.java index 7d2b9ef4511..5655e544121 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmeringWings.java +++ b/Mage.Sets/src/mage/cards/s/ShimmeringWings.java @@ -32,7 +32,7 @@ public final class ShimmeringWings extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. (It can't be blocked except by creatures with flying or reach.) diff --git a/Mage.Sets/src/mage/cards/s/ShinyImpetus.java b/Mage.Sets/src/mage/cards/s/ShinyImpetus.java index 2f0eef20584..634f5896a45 100644 --- a/Mage.Sets/src/mage/cards/s/ShinyImpetus.java +++ b/Mage.Sets/src/mage/cards/s/ShinyImpetus.java @@ -34,7 +34,7 @@ public final class ShinyImpetus extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and is goaded. diff --git a/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java b/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java index 7820e2d1081..d6b09d33968 100644 --- a/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/ShivsEmbrace.java @@ -38,7 +38,7 @@ public final class ShivsEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); diff --git a/Mage.Sets/src/mage/cards/s/ShortCircuit.java b/Mage.Sets/src/mage/cards/s/ShortCircuit.java index 85563112904..a2b78c2bae5 100644 --- a/Mage.Sets/src/mage/cards/s/ShortCircuit.java +++ b/Mage.Sets/src/mage/cards/s/ShortCircuit.java @@ -41,7 +41,7 @@ public final class ShortCircuit extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // As long as enchanted permanent is a creature, it gets -3/-0 and loses flying. Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( diff --git a/Mage.Sets/src/mage/cards/s/Sicken.java b/Mage.Sets/src/mage/cards/s/Sicken.java index 37eb422f38f..2a01fb18c32 100644 --- a/Mage.Sets/src/mage/cards/s/Sicken.java +++ b/Mage.Sets/src/mage/cards/s/Sicken.java @@ -30,7 +30,7 @@ public final class Sicken extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1, -1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/s/SiegeModification.java b/Mage.Sets/src/mage/cards/s/SiegeModification.java index 89add34aa5e..d0858047c33 100644 --- a/Mage.Sets/src/mage/cards/s/SiegeModification.java +++ b/Mage.Sets/src/mage/cards/s/SiegeModification.java @@ -39,7 +39,7 @@ public final class SiegeModification extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted permanent is a Vehicle, it's a creature in addition to its other types. diff --git a/Mage.Sets/src/mage/cards/s/Siegecraft.java b/Mage.Sets/src/mage/cards/s/Siegecraft.java index 5965a5740aa..0dceceb7cce 100644 --- a/Mage.Sets/src/mage/cards/s/Siegecraft.java +++ b/Mage.Sets/src/mage/cards/s/Siegecraft.java @@ -32,7 +32,7 @@ public final class Siegecraft extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+4. diff --git a/Mage.Sets/src/mage/cards/s/SigardasImprisonment.java b/Mage.Sets/src/mage/cards/s/SigardasImprisonment.java index 0c640fae3fa..0d68d4a3bf1 100644 --- a/Mage.Sets/src/mage/cards/s/SigardasImprisonment.java +++ b/Mage.Sets/src/mage/cards/s/SigardasImprisonment.java @@ -35,7 +35,7 @@ public final class SigardasImprisonment extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature can't attack or block. this.addAbility(new SimpleStaticAbility(new CantAttackBlockAttachedEffect(AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/s/SigilOfSleep.java b/Mage.Sets/src/mage/cards/s/SigilOfSleep.java index 6c366f131e9..ccbdace4c8f 100644 --- a/Mage.Sets/src/mage/cards/s/SigilOfSleep.java +++ b/Mage.Sets/src/mage/cards/s/SigilOfSleep.java @@ -35,7 +35,7 @@ public final class SigilOfSleep extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature deals damage to a player, return target creature that player controls to its owner's hand. diff --git a/Mage.Sets/src/mage/cards/s/SigilOfTheNayanGods.java b/Mage.Sets/src/mage/cards/s/SigilOfTheNayanGods.java index e9a5716ad5b..40b2c52af97 100644 --- a/Mage.Sets/src/mage/cards/s/SigilOfTheNayanGods.java +++ b/Mage.Sets/src/mage/cards/s/SigilOfTheNayanGods.java @@ -36,7 +36,7 @@ public final class SigilOfTheNayanGods extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1 for each creature you control. PermanentsOnBattlefieldCount amount = new PermanentsOnBattlefieldCount(filter, 1); diff --git a/Mage.Sets/src/mage/cards/s/SingingBellStrike.java b/Mage.Sets/src/mage/cards/s/SingingBellStrike.java index 3d5b9c600b8..f9566f503a9 100644 --- a/Mage.Sets/src/mage/cards/s/SingingBellStrike.java +++ b/Mage.Sets/src/mage/cards/s/SingingBellStrike.java @@ -40,7 +40,7 @@ public final class SingingBellStrike extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Singing Bell Strike enters the battlefield, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/s/SinisterPossession.java b/Mage.Sets/src/mage/cards/s/SinisterPossession.java index 986aa4eda8e..009b7d2c9cc 100644 --- a/Mage.Sets/src/mage/cards/s/SinisterPossession.java +++ b/Mage.Sets/src/mage/cards/s/SinisterPossession.java @@ -30,7 +30,7 @@ public final class SinisterPossession extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseLife)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks or blocks, it's controller loses 2 life. diff --git a/Mage.Sets/src/mage/cards/s/SinisterStrength.java b/Mage.Sets/src/mage/cards/s/SinisterStrength.java index a14e0e0c046..9584a37d733 100644 --- a/Mage.Sets/src/mage/cards/s/SinisterStrength.java +++ b/Mage.Sets/src/mage/cards/s/SinisterStrength.java @@ -36,7 +36,7 @@ public final class SinisterStrength extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+1 and is black. Effect effect = new BoostEnchantedEffect(3, 1); diff --git a/Mage.Sets/src/mage/cards/s/SinkingFeeling.java b/Mage.Sets/src/mage/cards/s/SinkingFeeling.java index a587eb38e25..f2bfb76758a 100644 --- a/Mage.Sets/src/mage/cards/s/SinkingFeeling.java +++ b/Mage.Sets/src/mage/cards/s/SinkingFeeling.java @@ -39,7 +39,7 @@ public final class SinkingFeeling extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/s/SinnersJudgment.java b/Mage.Sets/src/mage/cards/s/SinnersJudgment.java index 25d59e150e9..fbbe39edd11 100644 --- a/Mage.Sets/src/mage/cards/s/SinnersJudgment.java +++ b/Mage.Sets/src/mage/cards/s/SinnersJudgment.java @@ -38,7 +38,7 @@ public final class SinnersJudgment extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, put a judgment counter on Sinner's Judgment. Then if there are three or more judgment counters on it, enchanted player loses the game. diff --git a/Mage.Sets/src/mage/cards/s/SinstrikersWill.java b/Mage.Sets/src/mage/cards/s/SinstrikersWill.java index adfaf742d0b..3d017d8d834 100644 --- a/Mage.Sets/src/mage/cards/s/SinstrikersWill.java +++ b/Mage.Sets/src/mage/cards/s/SinstrikersWill.java @@ -38,7 +38,7 @@ public final class SinstrikersWill extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: This creature deals damage equal to its power to target attacking or blocking creature." diff --git a/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java b/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java index a01418d9111..6c8c0206346 100644 --- a/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java +++ b/Mage.Sets/src/mage/cards/s/SisaysIngenuity.java @@ -38,7 +38,7 @@ public final class SisaysIngenuity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Sisay's Ingenuity enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); diff --git a/Mage.Sets/src/mage/cards/s/SixthSense.java b/Mage.Sets/src/mage/cards/s/SixthSense.java index d8183218fca..8aefbb4f44b 100644 --- a/Mage.Sets/src/mage/cards/s/SixthSense.java +++ b/Mage.Sets/src/mage/cards/s/SixthSense.java @@ -39,7 +39,7 @@ public final class SixthSense extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever this creature deals combat damage to a player, you may draw a card." @@ -94,4 +94,4 @@ class SixthSenseTriggeredAbility extends TriggeredAbilityImpl { public String getRule() { return "Whenever this creature deals combat damage to a player, you may draw a card."; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java b/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java index 564ee4fe596..774aa9bb894 100644 --- a/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java +++ b/Mage.Sets/src/mage/cards/s/SkeletalGrimace.java @@ -37,7 +37,7 @@ public final class SkeletalGrimace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has "{B}: Regenerate this creature." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/s/SkinInvasion.java b/Mage.Sets/src/mage/cards/s/SkinInvasion.java index d41fd9d2657..6fe4f9c2b0d 100644 --- a/Mage.Sets/src/mage/cards/s/SkinInvasion.java +++ b/Mage.Sets/src/mage/cards/s/SkinInvasion.java @@ -40,7 +40,7 @@ public final class SkinInvasion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature attacks each combat if able. diff --git a/Mage.Sets/src/mage/cards/s/SkyTether.java b/Mage.Sets/src/mage/cards/s/SkyTether.java index 53a728d49a7..2fece4bef9e 100644 --- a/Mage.Sets/src/mage/cards/s/SkyTether.java +++ b/Mage.Sets/src/mage/cards/s/SkyTether.java @@ -30,7 +30,7 @@ public final class SkyTether extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has defender and loses flying. diff --git a/Mage.Sets/src/mage/cards/s/SkybladesBoon.java b/Mage.Sets/src/mage/cards/s/SkybladesBoon.java index d356f4620a5..022394440c6 100644 --- a/Mage.Sets/src/mage/cards/s/SkybladesBoon.java +++ b/Mage.Sets/src/mage/cards/s/SkybladesBoon.java @@ -36,7 +36,7 @@ public final class SkybladesBoon extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying. diff --git a/Mage.Sets/src/mage/cards/s/Skygames.java b/Mage.Sets/src/mage/cards/s/Skygames.java index b2a05fc6751..7f163d86ef5 100644 --- a/Mage.Sets/src/mage/cards/s/Skygames.java +++ b/Mage.Sets/src/mage/cards/s/Skygames.java @@ -33,7 +33,7 @@ public final class Skygames extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: Target creature gains flying until end of turn. Activate this ability only any time you could cast a sorcery." diff --git a/Mage.Sets/src/mage/cards/s/SleepParalysis.java b/Mage.Sets/src/mage/cards/s/SleepParalysis.java index 17a471ab711..f4f713dd274 100644 --- a/Mage.Sets/src/mage/cards/s/SleepParalysis.java +++ b/Mage.Sets/src/mage/cards/s/SleepParalysis.java @@ -31,7 +31,7 @@ public final class SleepParalysis extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Sleep Paralysis enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/s/SleepWithTheFishes.java b/Mage.Sets/src/mage/cards/s/SleepWithTheFishes.java index bc20568cd81..3790ce7a57b 100644 --- a/Mage.Sets/src/mage/cards/s/SleepWithTheFishes.java +++ b/Mage.Sets/src/mage/cards/s/SleepWithTheFishes.java @@ -33,7 +33,7 @@ public final class SleepWithTheFishes extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Sleep with the Fishes enters the battlefield, tap enchanted creature and you create a 1/1 blue Fish creature token with "This creature can't be blocked." Ability ability = new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect()); diff --git a/Mage.Sets/src/mage/cards/s/SleepersGuile.java b/Mage.Sets/src/mage/cards/s/SleepersGuile.java index dd50def072e..445e5afe000 100644 --- a/Mage.Sets/src/mage/cards/s/SleepersGuile.java +++ b/Mage.Sets/src/mage/cards/s/SleepersGuile.java @@ -35,7 +35,7 @@ public final class SleepersGuile extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has fear. diff --git a/Mage.Sets/src/mage/cards/s/SleepersRobe.java b/Mage.Sets/src/mage/cards/s/SleepersRobe.java index 5c44cc9ec86..1e128585650 100644 --- a/Mage.Sets/src/mage/cards/s/SleepersRobe.java +++ b/Mage.Sets/src/mage/cards/s/SleepersRobe.java @@ -35,7 +35,7 @@ public final class SleepersRobe extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has fear. diff --git a/Mage.Sets/src/mage/cards/s/SleepingPotion.java b/Mage.Sets/src/mage/cards/s/SleepingPotion.java index a25b7212b92..3ff32888412 100644 --- a/Mage.Sets/src/mage/cards/s/SleepingPotion.java +++ b/Mage.Sets/src/mage/cards/s/SleepingPotion.java @@ -32,7 +32,7 @@ public final class SleepingPotion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Sleeping Potion enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/s/Slimebind.java b/Mage.Sets/src/mage/cards/s/Slimebind.java index 345de79d54c..a4efe694f8d 100644 --- a/Mage.Sets/src/mage/cards/s/Slimebind.java +++ b/Mage.Sets/src/mage/cards/s/Slimebind.java @@ -33,7 +33,7 @@ public final class Slimebind extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -4/-0. diff --git a/Mage.Sets/src/mage/cards/s/SlowMotion.java b/Mage.Sets/src/mage/cards/s/SlowMotion.java index 705c11ef3b9..0408a05992f 100644 --- a/Mage.Sets/src/mage/cards/s/SlowMotion.java +++ b/Mage.Sets/src/mage/cards/s/SlowMotion.java @@ -37,7 +37,7 @@ public final class SlowMotion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of the upkeep of enchanted creature's controller, that player sacrifices that creature unless they pay {2}. diff --git a/Mage.Sets/src/mage/cards/s/Sluggishness.java b/Mage.Sets/src/mage/cards/s/Sluggishness.java index 552f681d4e6..cbb2c022262 100644 --- a/Mage.Sets/src/mage/cards/s/Sluggishness.java +++ b/Mage.Sets/src/mage/cards/s/Sluggishness.java @@ -34,7 +34,7 @@ public final class Sluggishness extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't block. diff --git a/Mage.Sets/src/mage/cards/s/SmokeShroud.java b/Mage.Sets/src/mage/cards/s/SmokeShroud.java index 7c9a9570e63..3d3a5ca2e6e 100644 --- a/Mage.Sets/src/mage/cards/s/SmokeShroud.java +++ b/Mage.Sets/src/mage/cards/s/SmokeShroud.java @@ -38,7 +38,7 @@ public final class SmokeShroud extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has flying. diff --git a/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java b/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java index 55296883263..1bceefd48b1 100644 --- a/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java +++ b/Mage.Sets/src/mage/cards/s/SnakeCultInitiation.java @@ -32,7 +32,7 @@ public final class SnakeCultInitiation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has poisonous 3. this.addAbility( diff --git a/Mage.Sets/src/mage/cards/s/SnakeUmbra.java b/Mage.Sets/src/mage/cards/s/SnakeUmbra.java index de4422ba3df..1ca5f7a274b 100644 --- a/Mage.Sets/src/mage/cards/s/SnakeUmbra.java +++ b/Mage.Sets/src/mage/cards/s/SnakeUmbra.java @@ -32,7 +32,7 @@ public final class SnakeUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 diff --git a/Mage.Sets/src/mage/cards/s/SnowDevil.java b/Mage.Sets/src/mage/cards/s/SnowDevil.java index b5693ae5704..a8f06c82d28 100644 --- a/Mage.Sets/src/mage/cards/s/SnowDevil.java +++ b/Mage.Sets/src/mage/cards/s/SnowDevil.java @@ -42,7 +42,7 @@ public final class SnowDevil extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has flying. diff --git a/Mage.Sets/src/mage/cards/s/Snowblind.java b/Mage.Sets/src/mage/cards/s/Snowblind.java index 265c01eb5df..b2fc2f0cebc 100644 --- a/Mage.Sets/src/mage/cards/s/Snowblind.java +++ b/Mage.Sets/src/mage/cards/s/Snowblind.java @@ -33,7 +33,7 @@ public final class Snowblind extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -X/-Y. If that creature is attacking, X is the number of snow lands defending player controls. Otherwise, X is the number of snow lands its controller controls. Y is equal to X or to enchanted creature's toughness minus 1, whichever is smaller. @@ -99,4 +99,4 @@ enum SnowblindValue implements DynamicValue { public String getMessage() { return ""; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SoShiny.java b/Mage.Sets/src/mage/cards/s/SoShiny.java index 68927898687..b33167ccafa 100644 --- a/Mage.Sets/src/mage/cards/s/SoShiny.java +++ b/Mage.Sets/src/mage/cards/s/SoShiny.java @@ -49,7 +49,7 @@ public final class SoShiny extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When So Shiny enters the battlefield, if you control a token, tap enchanted creature, then scry 2. diff --git a/Mage.Sets/src/mage/cards/s/SoTiny.java b/Mage.Sets/src/mage/cards/s/SoTiny.java index 48db1b608d1..90f77231ca5 100644 --- a/Mage.Sets/src/mage/cards/s/SoTiny.java +++ b/Mage.Sets/src/mage/cards/s/SoTiny.java @@ -39,7 +39,7 @@ public final class SoTiny extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-0. It gets -6/-0 instead as long as its controller has seven or more cards in their graveyard. diff --git a/Mage.Sets/src/mage/cards/s/Soar.java b/Mage.Sets/src/mage/cards/s/Soar.java index 654db3e2fc5..321cde44e04 100644 --- a/Mage.Sets/src/mage/cards/s/Soar.java +++ b/Mage.Sets/src/mage/cards/s/Soar.java @@ -40,7 +40,7 @@ public final class Soar extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+1 and has flying. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 1, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/s/SoaringHope.java b/Mage.Sets/src/mage/cards/s/SoaringHope.java index 2bd9704cd40..3d9a081e1df 100644 --- a/Mage.Sets/src/mage/cards/s/SoaringHope.java +++ b/Mage.Sets/src/mage/cards/s/SoaringHope.java @@ -37,7 +37,7 @@ public final class SoaringHope extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Soaring Hope comes into play, you gain 3 life. diff --git a/Mage.Sets/src/mage/cards/s/SolidFooting.java b/Mage.Sets/src/mage/cards/s/SolidFooting.java index 348bd4ae26e..371a0afba60 100644 --- a/Mage.Sets/src/mage/cards/s/SolidFooting.java +++ b/Mage.Sets/src/mage/cards/s/SolidFooting.java @@ -37,7 +37,7 @@ public final class SolidFooting extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java b/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java index aef644aa673..d0b1de494cf 100644 --- a/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java +++ b/Mage.Sets/src/mage/cards/s/SongOfTheDryads.java @@ -28,7 +28,7 @@ public final class SongOfTheDryads extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent is a colorless Forest land. diff --git a/Mage.Sets/src/mage/cards/s/SoulBleed.java b/Mage.Sets/src/mage/cards/s/SoulBleed.java index ad313f44601..d4fa84fe99f 100644 --- a/Mage.Sets/src/mage/cards/s/SoulBleed.java +++ b/Mage.Sets/src/mage/cards/s/SoulBleed.java @@ -31,7 +31,7 @@ public final class SoulBleed extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of the upkeep of enchanted creature's controller, that player loses 1 life. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), TargetController.CONTROLLER_ATTACHED_TO, false, true)); } diff --git a/Mage.Sets/src/mage/cards/s/SoulChanneling.java b/Mage.Sets/src/mage/cards/s/SoulChanneling.java index 2651d67f70f..5cd357e0563 100644 --- a/Mage.Sets/src/mage/cards/s/SoulChanneling.java +++ b/Mage.Sets/src/mage/cards/s/SoulChanneling.java @@ -29,7 +29,7 @@ public final class SoulChanneling extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Regenerate)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Pay 2 life: Regenerate enchanted creature. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new PayLifeCost(2))); diff --git a/Mage.Sets/src/mage/cards/s/SoulKiss.java b/Mage.Sets/src/mage/cards/s/SoulKiss.java index 683f640a167..1ea87a2df78 100644 --- a/Mage.Sets/src/mage/cards/s/SoulKiss.java +++ b/Mage.Sets/src/mage/cards/s/SoulKiss.java @@ -33,7 +33,7 @@ public final class SoulKiss extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {B}, Pay 1 life: Enchanted creature gets +2/+2 until end of turn. Activate this ability no more than three times each turn. ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.EndOfTurn), diff --git a/Mage.Sets/src/mage/cards/s/SoulLink.java b/Mage.Sets/src/mage/cards/s/SoulLink.java index b77f6e96e09..818a96d3b15 100644 --- a/Mage.Sets/src/mage/cards/s/SoulLink.java +++ b/Mage.Sets/src/mage/cards/s/SoulLink.java @@ -30,7 +30,7 @@ public final class SoulLink extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature deals damage, you gain that much life. this.addAbility(new DealsDamageAttachedTriggeredAbility(Zone.BATTLEFIELD, diff --git a/Mage.Sets/src/mage/cards/s/SoulRansom.java b/Mage.Sets/src/mage/cards/s/SoulRansom.java index 49043c18f4b..b82fb3d2c45 100644 --- a/Mage.Sets/src/mage/cards/s/SoulRansom.java +++ b/Mage.Sets/src/mage/cards/s/SoulRansom.java @@ -35,7 +35,7 @@ public final class SoulRansom extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/s/SoulStrikeTechnique.java b/Mage.Sets/src/mage/cards/s/SoulStrikeTechnique.java index 61cd9e1ebbd..bacdb91360d 100644 --- a/Mage.Sets/src/mage/cards/s/SoulStrikeTechnique.java +++ b/Mage.Sets/src/mage/cards/s/SoulStrikeTechnique.java @@ -34,7 +34,7 @@ public final class SoulStrikeTechnique extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has vigilance. diff --git a/Mage.Sets/src/mage/cards/s/SoulTithe.java b/Mage.Sets/src/mage/cards/s/SoulTithe.java index 33286023435..e8a6d308a1c 100644 --- a/Mage.Sets/src/mage/cards/s/SoulTithe.java +++ b/Mage.Sets/src/mage/cards/s/SoulTithe.java @@ -36,7 +36,7 @@ public final class SoulTithe extends CardImpl { TargetPermanent auraTarget = new TargetNonlandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of the upkeep of enchanted permanent's controller, diff --git a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java index cdc675d8d53..677ce6b084b 100644 --- a/Mage.Sets/src/mage/cards/s/SpawningGrounds.java +++ b/Mage.Sets/src/mage/cards/s/SpawningGrounds.java @@ -36,7 +36,7 @@ public final class SpawningGrounds extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: Create a 5/5 green Beast creature token with trample." diff --git a/Mage.Sets/src/mage/cards/s/SpectraWard.java b/Mage.Sets/src/mage/cards/s/SpectraWard.java index 8b8a085065f..36afa3d2efe 100644 --- a/Mage.Sets/src/mage/cards/s/SpectraWard.java +++ b/Mage.Sets/src/mage/cards/s/SpectraWard.java @@ -50,7 +50,7 @@ public final class SpectraWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has protection from all colors. This effect doesn't remove auras. diff --git a/Mage.Sets/src/mage/cards/s/SpectralBinding.java b/Mage.Sets/src/mage/cards/s/SpectralBinding.java index d2aed3b2fd4..2e1e000c303 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralBinding.java +++ b/Mage.Sets/src/mage/cards/s/SpectralBinding.java @@ -33,7 +33,7 @@ public final class SpectralBinding extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-0. diff --git a/Mage.Sets/src/mage/cards/s/SpectralCloak.java b/Mage.Sets/src/mage/cards/s/SpectralCloak.java index 043f5448959..5c014bd5209 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralCloak.java +++ b/Mage.Sets/src/mage/cards/s/SpectralCloak.java @@ -36,7 +36,7 @@ public final class SpectralCloak extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shroud as long as it's untapped. diff --git a/Mage.Sets/src/mage/cards/s/SpectralFlight.java b/Mage.Sets/src/mage/cards/s/SpectralFlight.java index 1d281510f42..581021a8402 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralFlight.java +++ b/Mage.Sets/src/mage/cards/s/SpectralFlight.java @@ -27,10 +27,10 @@ public final class SpectralFlight extends CardImpl { // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(); - this.getSpellAbility().addTarget(target); + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(target.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. diff --git a/Mage.Sets/src/mage/cards/s/SpectralGrasp.java b/Mage.Sets/src/mage/cards/s/SpectralGrasp.java index 2893a98a8c9..0b1f487f287 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralGrasp.java +++ b/Mage.Sets/src/mage/cards/s/SpectralGrasp.java @@ -41,7 +41,7 @@ public final class SpectralGrasp extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack you or a planeswalker you control. diff --git a/Mage.Sets/src/mage/cards/s/SpectralPrison.java b/Mage.Sets/src/mage/cards/s/SpectralPrison.java index 32b82d1d3fd..75d89842814 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralPrison.java +++ b/Mage.Sets/src/mage/cards/s/SpectralPrison.java @@ -31,7 +31,7 @@ public final class SpectralPrison extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/s/SpectralShield.java b/Mage.Sets/src/mage/cards/s/SpectralShield.java index 50810a96710..c8465609a3a 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralShield.java +++ b/Mage.Sets/src/mage/cards/s/SpectralShield.java @@ -29,7 +29,7 @@ public final class SpectralShield extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature get's +0/+2 diff --git a/Mage.Sets/src/mage/cards/s/SpectralSteel.java b/Mage.Sets/src/mage/cards/s/SpectralSteel.java index 5b783626905..14cf0323182 100644 --- a/Mage.Sets/src/mage/cards/s/SpectralSteel.java +++ b/Mage.Sets/src/mage/cards/s/SpectralSteel.java @@ -49,7 +49,7 @@ public final class SpectralSteel extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/s/SpellweaverVolute.java b/Mage.Sets/src/mage/cards/s/SpellweaverVolute.java index 77617b686a8..a93c3d1851a 100644 --- a/Mage.Sets/src/mage/cards/s/SpellweaverVolute.java +++ b/Mage.Sets/src/mage/cards/s/SpellweaverVolute.java @@ -38,7 +38,7 @@ public final class SpellweaverVolute extends CardImpl { TargetCardInGraveyard auraTarget = new TargetCardInGraveyard(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever you cast a sorcery spell, copy the enchanted instant card. diff --git a/Mage.Sets/src/mage/cards/s/SpiderClimb.java b/Mage.Sets/src/mage/cards/s/SpiderClimb.java index 5b964e7119d..d9dedc8e48c 100644 --- a/Mage.Sets/src/mage/cards/s/SpiderClimb.java +++ b/Mage.Sets/src/mage/cards/s/SpiderClimb.java @@ -40,7 +40,7 @@ public final class SpiderClimb extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+3 and has reach. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 3, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/s/SpiderUmbra.java b/Mage.Sets/src/mage/cards/s/SpiderUmbra.java index 450a8efac39..2a44f689603 100644 --- a/Mage.Sets/src/mage/cards/s/SpiderUmbra.java +++ b/Mage.Sets/src/mage/cards/s/SpiderUmbra.java @@ -29,7 +29,7 @@ public final class SpiderUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1 and has reach. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/s/SpinalGraft.java b/Mage.Sets/src/mage/cards/s/SpinalGraft.java index fc3b67bfe20..0f0cff4bdc9 100644 --- a/Mage.Sets/src/mage/cards/s/SpinalGraft.java +++ b/Mage.Sets/src/mage/cards/s/SpinalGraft.java @@ -31,7 +31,7 @@ public final class SpinalGraft extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +3/+3. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/s/SpiritAway.java b/Mage.Sets/src/mage/cards/s/SpiritAway.java index 810ce2d2093..bf3444f87d0 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritAway.java +++ b/Mage.Sets/src/mage/cards/s/SpiritAway.java @@ -37,7 +37,7 @@ public final class SpiritAway extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/s/SpiritLink.java b/Mage.Sets/src/mage/cards/s/SpiritLink.java index 422399d667d..de2173b194e 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritLink.java +++ b/Mage.Sets/src/mage/cards/s/SpiritLink.java @@ -30,7 +30,7 @@ public final class SpiritLink extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature deals damage, you gain that much life. this.addAbility(new DealsDamageAttachedTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(SavedDamageValue.MUCH), false)); diff --git a/Mage.Sets/src/mage/cards/s/SpiritLoop.java b/Mage.Sets/src/mage/cards/s/SpiritLoop.java index c629ea21665..6dc771bd3d7 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritLoop.java +++ b/Mage.Sets/src/mage/cards/s/SpiritLoop.java @@ -30,7 +30,7 @@ public final class SpiritLoop extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature deals damage, you gain that much life. this.addAbility(new DealsDamageAttachedTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(SavedDamageValue.MUCH), false)); diff --git a/Mage.Sets/src/mage/cards/s/SpiritMantle.java b/Mage.Sets/src/mage/cards/s/SpiritMantle.java index b499a984a9a..9e33e583069 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritMantle.java +++ b/Mage.Sets/src/mage/cards/s/SpiritMantle.java @@ -32,7 +32,7 @@ public final class SpiritMantle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has protection from creatures. diff --git a/Mage.Sets/src/mage/cards/s/SpiritShackle.java b/Mage.Sets/src/mage/cards/s/SpiritShackle.java index 63c1865909c..31226b8d92f 100644 --- a/Mage.Sets/src/mage/cards/s/SpiritShackle.java +++ b/Mage.Sets/src/mage/cards/s/SpiritShackle.java @@ -31,7 +31,7 @@ public final class SpiritShackle extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature becomes tapped, put a -0/-2 counter on it. diff --git a/Mage.Sets/src/mage/cards/s/SpitefulMotives.java b/Mage.Sets/src/mage/cards/s/SpitefulMotives.java index e9ebc320f0a..dd8bee4a958 100644 --- a/Mage.Sets/src/mage/cards/s/SpitefulMotives.java +++ b/Mage.Sets/src/mage/cards/s/SpitefulMotives.java @@ -38,7 +38,7 @@ public final class SpitefulMotives extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+0 and has first strike. Effect effect = new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/s/SpitefulShadows.java b/Mage.Sets/src/mage/cards/s/SpitefulShadows.java index fa69c30882b..5be3cf0cf98 100644 --- a/Mage.Sets/src/mage/cards/s/SpitefulShadows.java +++ b/Mage.Sets/src/mage/cards/s/SpitefulShadows.java @@ -30,7 +30,7 @@ public final class SpitefulShadows extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature is dealt damage, it deals that much damage to its controller. this.addAbility(new DealtDamageAttachedTriggeredAbility(Zone.BATTLEFIELD, new SpitefulShadowsEffect(), diff --git a/Mage.Sets/src/mage/cards/s/SplinterTwin.java b/Mage.Sets/src/mage/cards/s/SplinterTwin.java index 0871fffdbc5..19916e20d7c 100644 --- a/Mage.Sets/src/mage/cards/s/SplinterTwin.java +++ b/Mage.Sets/src/mage/cards/s/SplinterTwin.java @@ -41,7 +41,7 @@ public final class SplinterTwin extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "{tap}: Create a token that's a copy of this creature, except it has haste. Exile it at the beginning of the next end step." SimpleActivatedAbility gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SplinterTwinEffect(), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SpontaneousMutation.java b/Mage.Sets/src/mage/cards/s/SpontaneousMutation.java index a43e9e17876..eefea56e6ec 100644 --- a/Mage.Sets/src/mage/cards/s/SpontaneousMutation.java +++ b/Mage.Sets/src/mage/cards/s/SpontaneousMutation.java @@ -38,7 +38,7 @@ public final class SpontaneousMutation extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -X/-0, where X is the number of cards in your graveyard. diff --git a/Mage.Sets/src/mage/cards/s/SpreadingAlgae.java b/Mage.Sets/src/mage/cards/s/SpreadingAlgae.java index ebcb385cf15..591b833a65c 100644 --- a/Mage.Sets/src/mage/cards/s/SpreadingAlgae.java +++ b/Mage.Sets/src/mage/cards/s/SpreadingAlgae.java @@ -37,7 +37,7 @@ public final class SpreadingAlgae extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted land becomes tapped, destroy it. this.addAbility(new BecomesTappedAttachedTriggeredAbility(new DestroyAttachedToEffect("it"), "enchanted land")); diff --git a/Mage.Sets/src/mage/cards/s/SpreadingSeas.java b/Mage.Sets/src/mage/cards/s/SpreadingSeas.java index b27071cfe38..2be0086a1c4 100644 --- a/Mage.Sets/src/mage/cards/s/SpreadingSeas.java +++ b/Mage.Sets/src/mage/cards/s/SpreadingSeas.java @@ -36,7 +36,7 @@ public final class SpreadingSeas extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Spreading Seas enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/s/SqueesEmbrace.java b/Mage.Sets/src/mage/cards/s/SqueesEmbrace.java index 6c43c386f72..de32385da3a 100644 --- a/Mage.Sets/src/mage/cards/s/SqueesEmbrace.java +++ b/Mage.Sets/src/mage/cards/s/SqueesEmbrace.java @@ -33,7 +33,7 @@ public final class SqueesEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/s/SquiresDevotion.java b/Mage.Sets/src/mage/cards/s/SquiresDevotion.java index 17d0edfab78..61e5aaced72 100644 --- a/Mage.Sets/src/mage/cards/s/SquiresDevotion.java +++ b/Mage.Sets/src/mage/cards/s/SquiresDevotion.java @@ -39,7 +39,7 @@ public final class SquiresDevotion extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has lifelink. diff --git a/Mage.Sets/src/mage/cards/s/SquirrelNest.java b/Mage.Sets/src/mage/cards/s/SquirrelNest.java index f890e896251..ba45007c77c 100644 --- a/Mage.Sets/src/mage/cards/s/SquirrelNest.java +++ b/Mage.Sets/src/mage/cards/s/SquirrelNest.java @@ -37,7 +37,7 @@ public final class SquirrelNest extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{tap}: Create a 1/1 green Squirrel creature token." diff --git a/Mage.Sets/src/mage/cards/s/StabWound.java b/Mage.Sets/src/mage/cards/s/StabWound.java index 238611be083..4031215f6a7 100644 --- a/Mage.Sets/src/mage/cards/s/StabWound.java +++ b/Mage.Sets/src/mage/cards/s/StabWound.java @@ -38,7 +38,7 @@ public final class StabWound extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-2. diff --git a/Mage.Sets/src/mage/cards/s/StaggeringInsight.java b/Mage.Sets/src/mage/cards/s/StaggeringInsight.java index b27cd459685..b57f9773807 100644 --- a/Mage.Sets/src/mage/cards/s/StaggeringInsight.java +++ b/Mage.Sets/src/mage/cards/s/StaggeringInsight.java @@ -31,7 +31,7 @@ public final class StaggeringInsight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has lifelink and "Whenever this creature deals combat damage to a player, draw a card." diff --git a/Mage.Sets/src/mage/cards/s/Stamina.java b/Mage.Sets/src/mage/cards/s/Stamina.java index b3dd1c84d85..c4cfc32a417 100644 --- a/Mage.Sets/src/mage/cards/s/Stamina.java +++ b/Mage.Sets/src/mage/cards/s/Stamina.java @@ -36,7 +36,7 @@ public final class Stamina extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has vigilance. diff --git a/Mage.Sets/src/mage/cards/s/StarlitMantle.java b/Mage.Sets/src/mage/cards/s/StarlitMantle.java index af25f23490a..c64e86da64e 100644 --- a/Mage.Sets/src/mage/cards/s/StarlitMantle.java +++ b/Mage.Sets/src/mage/cards/s/StarlitMantle.java @@ -34,7 +34,7 @@ public final class StarlitMantle extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Starlit Mantle enters the battlefield, enchanted creature gains hexproof until end of turn. diff --git a/Mage.Sets/src/mage/cards/s/StasisCell.java b/Mage.Sets/src/mage/cards/s/StasisCell.java index f888d40d9f9..73da358ddcc 100644 --- a/Mage.Sets/src/mage/cards/s/StasisCell.java +++ b/Mage.Sets/src/mage/cards/s/StasisCell.java @@ -33,7 +33,7 @@ public final class StasisCell extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature doesn't untap during its controller's untap step. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/s/StasisCocoon.java b/Mage.Sets/src/mage/cards/s/StasisCocoon.java index 5d7bc44eb58..24b917a0d1b 100644 --- a/Mage.Sets/src/mage/cards/s/StasisCocoon.java +++ b/Mage.Sets/src/mage/cards/s/StasisCocoon.java @@ -31,7 +31,7 @@ public final class StasisCocoon extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/StealArtifact.java b/Mage.Sets/src/mage/cards/s/StealArtifact.java index c1f62897dae..6804502f19a 100644 --- a/Mage.Sets/src/mage/cards/s/StealArtifact.java +++ b/Mage.Sets/src/mage/cards/s/StealArtifact.java @@ -30,7 +30,7 @@ public final class StealArtifact extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted artifact. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("artifact"))); diff --git a/Mage.Sets/src/mage/cards/s/StealEnchantment.java b/Mage.Sets/src/mage/cards/s/StealEnchantment.java index fc481e1d632..a4154a460e7 100644 --- a/Mage.Sets/src/mage/cards/s/StealEnchantment.java +++ b/Mage.Sets/src/mage/cards/s/StealEnchantment.java @@ -31,7 +31,7 @@ public final class StealEnchantment extends CardImpl { TargetPermanent auraTarget = new TargetEnchantmentPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted enchantment. diff --git a/Mage.Sets/src/mage/cards/s/SteamVines.java b/Mage.Sets/src/mage/cards/s/SteamVines.java index 4a3f7535671..34dffea4384 100644 --- a/Mage.Sets/src/mage/cards/s/SteamVines.java +++ b/Mage.Sets/src/mage/cards/s/SteamVines.java @@ -37,7 +37,7 @@ public final class SteamVines extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted land becomes tapped, destroy it and Steam Vines deals 1 damage to that land's controller. diff --git a/Mage.Sets/src/mage/cards/s/SteelOfTheGodhead.java b/Mage.Sets/src/mage/cards/s/SteelOfTheGodhead.java index e369fff7e0f..c6149f5bce5 100644 --- a/Mage.Sets/src/mage/cards/s/SteelOfTheGodhead.java +++ b/Mage.Sets/src/mage/cards/s/SteelOfTheGodhead.java @@ -40,7 +40,7 @@ public final class SteelOfTheGodhead extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As long as enchanted creature is white, it gets +1/+1 and has lifelink. SimpleStaticAbility whiteAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostEnchantedEffect(1, 1), new EnchantedCreatureColorCondition(ObjectColor.WHITE), "As long as enchanted creature is white, it gets +1/+1")); diff --git a/Mage.Sets/src/mage/cards/s/StickyFingers.java b/Mage.Sets/src/mage/cards/s/StickyFingers.java index 557fbf2e54f..47f5c133517 100644 --- a/Mage.Sets/src/mage/cards/s/StickyFingers.java +++ b/Mage.Sets/src/mage/cards/s/StickyFingers.java @@ -37,7 +37,7 @@ public final class StickyFingers extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has menace and "Whenever this creature deals combat damage to a player, create a Treasure token. Ability ability = new SimpleStaticAbility(new GainAbilityAttachedEffect(new MenaceAbility(false), AttachmentType.AURA)); diff --git a/Mage.Sets/src/mage/cards/s/Stonehands.java b/Mage.Sets/src/mage/cards/s/Stonehands.java index ac3e1ce53b6..c95515000db 100644 --- a/Mage.Sets/src/mage/cards/s/Stonehands.java +++ b/Mage.Sets/src/mage/cards/s/Stonehands.java @@ -34,7 +34,7 @@ public final class Stonehands extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2. diff --git a/Mage.Sets/src/mage/cards/s/Stoneskin.java b/Mage.Sets/src/mage/cards/s/Stoneskin.java index 4bcdc7b7487..c24587ea3c7 100644 --- a/Mage.Sets/src/mage/cards/s/Stoneskin.java +++ b/Mage.Sets/src/mage/cards/s/Stoneskin.java @@ -32,7 +32,7 @@ public final class Stoneskin extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +0/+10. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(0, 10))); diff --git a/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java b/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java index 3e7c06cc3dd..3529d541a82 100644 --- a/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java +++ b/Mage.Sets/src/mage/cards/s/StrandsOfUndeath.java @@ -37,7 +37,7 @@ public final class StrandsOfUndeath extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateAttachedEffect(AttachmentType.AURA), new ManaCostsImpl<>("{B}"))); Ability abilityDiscard = new EntersBattlefieldTriggeredAbility(new DiscardTargetEffect(2)); diff --git a/Mage.Sets/src/mage/cards/s/StrangeAugmentation.java b/Mage.Sets/src/mage/cards/s/StrangeAugmentation.java index e8a468e88cc..b83601b25b7 100644 --- a/Mage.Sets/src/mage/cards/s/StrangeAugmentation.java +++ b/Mage.Sets/src/mage/cards/s/StrangeAugmentation.java @@ -32,7 +32,7 @@ public final class StrangeAugmentation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/s/StranglingGrasp.java b/Mage.Sets/src/mage/cards/s/StranglingGrasp.java index 0cd028601f4..93d7e9eb6f4 100644 --- a/Mage.Sets/src/mage/cards/s/StranglingGrasp.java +++ b/Mage.Sets/src/mage/cards/s/StranglingGrasp.java @@ -44,7 +44,7 @@ public final class StranglingGrasp extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of your upkeep, enchanted permanent's controller sacrifices a nonland permanent and loses 1 life. diff --git a/Mage.Sets/src/mage/cards/s/StratusWalk.java b/Mage.Sets/src/mage/cards/s/StratusWalk.java index 2768123e4bc..e455bb5dd7d 100644 --- a/Mage.Sets/src/mage/cards/s/StratusWalk.java +++ b/Mage.Sets/src/mage/cards/s/StratusWalk.java @@ -37,7 +37,7 @@ public final class StratusWalk extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Stratus Walk enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1))); diff --git a/Mage.Sets/src/mage/cards/s/StreetSavvy.java b/Mage.Sets/src/mage/cards/s/StreetSavvy.java index d80f340b7e1..386a9c3d303 100644 --- a/Mage.Sets/src/mage/cards/s/StreetSavvy.java +++ b/Mage.Sets/src/mage/cards/s/StreetSavvy.java @@ -31,7 +31,7 @@ public final class StreetSavvy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2 and can block creatures with landwalk abilities as though they didn't have those abilities. @@ -77,4 +77,4 @@ class StreetSavvyEffect extends AsThoughEffectImpl { Permanent sourcePermanent = source.getSourcePermanentIfItStillExists(game); return sourcePermanent != null && sourceId.equals(sourcePermanent.getAttachedTo()); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java b/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java index 82cd1896bfd..983f1b24163 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfIsolation.java @@ -38,7 +38,7 @@ public final class StrengthOfIsolation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+2 and has protection from black. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java b/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java index f218b0ad07b..0878ce04a0b 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfLunacy.java @@ -38,7 +38,7 @@ public final class StrengthOfLunacy extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1 and has protection from white. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/s/StrengthOfUnity.java b/Mage.Sets/src/mage/cards/s/StrengthOfUnity.java index fbd5f118e8b..26310161392 100644 --- a/Mage.Sets/src/mage/cards/s/StrengthOfUnity.java +++ b/Mage.Sets/src/mage/cards/s/StrengthOfUnity.java @@ -32,7 +32,7 @@ public final class StrengthOfUnity extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Domain - Enchanted creature gets +1/+1 for each basic land type among lands you control. Effect effect = new BoostEnchantedEffect(DomainValue.REGULAR, DomainValue.REGULAR); diff --git a/Mage.Sets/src/mage/cards/s/StunningStrike.java b/Mage.Sets/src/mage/cards/s/StunningStrike.java index 2a6cafe8c54..fef1f86a5d5 100644 --- a/Mage.Sets/src/mage/cards/s/StunningStrike.java +++ b/Mage.Sets/src/mage/cards/s/StunningStrike.java @@ -52,7 +52,7 @@ public final class StunningStrike extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Stunning Strike enters the battlefield, tap enchanted creature and remove it from combat. this.addAbility(new EntersBattlefieldTriggeredAbility(new StunningStrikeEffect())); diff --git a/Mage.Sets/src/mage/cards/s/StupefyingTouch.java b/Mage.Sets/src/mage/cards/s/StupefyingTouch.java index 6c39f705c75..c65b7e78c25 100644 --- a/Mage.Sets/src/mage/cards/s/StupefyingTouch.java +++ b/Mage.Sets/src/mage/cards/s/StupefyingTouch.java @@ -30,7 +30,7 @@ public final class StupefyingTouch extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Stupefying Touch enters the battlefield, draw a card. @@ -80,4 +80,4 @@ class CantActivateAbilitiesAttachedEffect extends RestrictionEffect { return new CantActivateAbilitiesAttachedEffect(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/SultaiRunemark.java b/Mage.Sets/src/mage/cards/s/SultaiRunemark.java index 9d1b78adec3..c38b5928745 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiRunemark.java +++ b/Mage.Sets/src/mage/cards/s/SultaiRunemark.java @@ -46,7 +46,7 @@ public final class SultaiRunemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/s/SunClasp.java b/Mage.Sets/src/mage/cards/s/SunClasp.java index 0fc0c77dc56..48e5525c9ea 100644 --- a/Mage.Sets/src/mage/cards/s/SunClasp.java +++ b/Mage.Sets/src/mage/cards/s/SunClasp.java @@ -34,7 +34,7 @@ public final class SunClasp extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+3. @@ -82,4 +82,4 @@ class SunClaspReturnEffect extends OneShotEffect { } return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/Sunbond.java b/Mage.Sets/src/mage/cards/s/Sunbond.java index 3f1fb869169..23c35700203 100644 --- a/Mage.Sets/src/mage/cards/s/Sunbond.java +++ b/Mage.Sets/src/mage/cards/s/Sunbond.java @@ -39,7 +39,7 @@ public final class Sunbond extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has "Whenever you gain life, put that many +1/+1 counters on this creature." Effect effect = new GainAbilityAttachedEffect(new GainLifeControllerTriggeredAbility(new SunbondEffect(), false, true), AttachmentType.AURA, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/s/SunkenField.java b/Mage.Sets/src/mage/cards/s/SunkenField.java index 7bfbc2bf975..8c789e2817f 100644 --- a/Mage.Sets/src/mage/cards/s/SunkenField.java +++ b/Mage.Sets/src/mage/cards/s/SunkenField.java @@ -37,7 +37,7 @@ public final class SunkenField extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Counter target spell unless its controller pays {1}." ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new ManaCostsImpl<>("{1}")), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SupernaturalRescue.java b/Mage.Sets/src/mage/cards/s/SupernaturalRescue.java index d15e55fd1b9..180e169c488 100644 --- a/Mage.Sets/src/mage/cards/s/SupernaturalRescue.java +++ b/Mage.Sets/src/mage/cards/s/SupernaturalRescue.java @@ -56,7 +56,7 @@ public final class SupernaturalRescue extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+2. this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(1, 2))); diff --git a/Mage.Sets/src/mage/cards/s/SuppressionBonds.java b/Mage.Sets/src/mage/cards/s/SuppressionBonds.java index 7d2eb18539d..828ba9055cd 100644 --- a/Mage.Sets/src/mage/cards/s/SuppressionBonds.java +++ b/Mage.Sets/src/mage/cards/s/SuppressionBonds.java @@ -31,7 +31,7 @@ public final class SuppressionBonds extends CardImpl { TargetPermanent auraTarget = new TargetNonlandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent can't attack or block, and its activated abilities can't be actiated. diff --git a/Mage.Sets/src/mage/cards/s/SurgingMight.java b/Mage.Sets/src/mage/cards/s/SurgingMight.java index a220c3b2053..21e815ee2d1 100644 --- a/Mage.Sets/src/mage/cards/s/SurgingMight.java +++ b/Mage.Sets/src/mage/cards/s/SurgingMight.java @@ -32,7 +32,7 @@ public final class SurgingMight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/s/Swashbuckling.java b/Mage.Sets/src/mage/cards/s/Swashbuckling.java index 89d7a6d0aa5..e467e6b7d7b 100644 --- a/Mage.Sets/src/mage/cards/s/Swashbuckling.java +++ b/Mage.Sets/src/mage/cards/s/Swashbuckling.java @@ -35,7 +35,7 @@ public final class Swashbuckling extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has haste. diff --git a/Mage.Sets/src/mage/cards/s/SwiftReconfiguration.java b/Mage.Sets/src/mage/cards/s/SwiftReconfiguration.java index d8a774f2802..1791aaaf9c6 100644 --- a/Mage.Sets/src/mage/cards/s/SwiftReconfiguration.java +++ b/Mage.Sets/src/mage/cards/s/SwiftReconfiguration.java @@ -44,7 +44,7 @@ public final class SwiftReconfiguration extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted permanent is a Vehicle artifact with crew 5 and it loses all other card types. this.addAbility(new SimpleStaticAbility(new SwiftReconfigurationEffect())); diff --git a/Mage.Sets/src/mage/cards/t/TahngarthsRage.java b/Mage.Sets/src/mage/cards/t/TahngarthsRage.java index 10f3c6a8ad7..12ca298887b 100644 --- a/Mage.Sets/src/mage/cards/t/TahngarthsRage.java +++ b/Mage.Sets/src/mage/cards/t/TahngarthsRage.java @@ -35,7 +35,7 @@ public final class TahngarthsRage extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+0 as long as it's attacking. Otherwise, it gets -2/-1. diff --git a/Mage.Sets/src/mage/cards/t/TaintedWell.java b/Mage.Sets/src/mage/cards/t/TaintedWell.java index 631591b9195..61f785d356e 100644 --- a/Mage.Sets/src/mage/cards/t/TaintedWell.java +++ b/Mage.Sets/src/mage/cards/t/TaintedWell.java @@ -34,7 +34,7 @@ public final class TaintedWell extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Tainted Well enters the battlefield, draw a card. this.addAbility(new EntersBattlefieldTriggeredAbility(new DrawCardSourceControllerEffect(1), false)); diff --git a/Mage.Sets/src/mage/cards/t/TakePossession.java b/Mage.Sets/src/mage/cards/t/TakePossession.java index 79a4fcc5294..62c8157e359 100644 --- a/Mage.Sets/src/mage/cards/t/TakePossession.java +++ b/Mage.Sets/src/mage/cards/t/TakePossession.java @@ -33,7 +33,7 @@ public final class TakePossession extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted permanent. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect("permanent"))); diff --git a/Mage.Sets/src/mage/cards/t/TallAsABeanstalk.java b/Mage.Sets/src/mage/cards/t/TallAsABeanstalk.java index 249a67404d4..0f6031b2abf 100644 --- a/Mage.Sets/src/mage/cards/t/TallAsABeanstalk.java +++ b/Mage.Sets/src/mage/cards/t/TallAsABeanstalk.java @@ -30,7 +30,7 @@ public final class TallAsABeanstalk extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3, has reach, and is a Giant in addition to its other types. diff --git a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java index 42842165f2b..62a8d948180 100644 --- a/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java +++ b/Mage.Sets/src/mage/cards/t/TalonsOfFalkenrath.java @@ -37,7 +37,7 @@ public final class TalonsOfFalkenrath extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "{1}{R}: This creature gets +2/+0 until end of turn." this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{R}")), diff --git a/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java b/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java index 2f95b45a148..97837054184 100644 --- a/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java +++ b/Mage.Sets/src/mage/cards/t/TalonsOfWildwood.java @@ -37,7 +37,7 @@ public final class TalonsOfWildwood extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has trample. diff --git a/Mage.Sets/src/mage/cards/t/TamiyosCompleation.java b/Mage.Sets/src/mage/cards/t/TamiyosCompleation.java index 3d5fe53db76..15e829a5971 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyosCompleation.java +++ b/Mage.Sets/src/mage/cards/t/TamiyosCompleation.java @@ -44,7 +44,7 @@ public final class TamiyosCompleation extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Tamiyo's Compleation enters the battlefield, tap enchanted permanent. If it's an Equipment, unattach it. this.addAbility(new EntersBattlefieldTriggeredAbility(new TamiyosCompleationTapEffect())); diff --git a/Mage.Sets/src/mage/cards/t/TangleKelp.java b/Mage.Sets/src/mage/cards/t/TangleKelp.java index 4b8c290679e..019526a98d3 100644 --- a/Mage.Sets/src/mage/cards/t/TangleKelp.java +++ b/Mage.Sets/src/mage/cards/t/TangleKelp.java @@ -41,7 +41,7 @@ public final class TangleKelp extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Tangle Kelp enters the battlefield, tap enchanted creature. diff --git a/Mage.Sets/src/mage/cards/t/TasteForMayhem.java b/Mage.Sets/src/mage/cards/t/TasteForMayhem.java index 3b1351b7417..3a9e6486aad 100644 --- a/Mage.Sets/src/mage/cards/t/TasteForMayhem.java +++ b/Mage.Sets/src/mage/cards/t/TasteForMayhem.java @@ -32,7 +32,7 @@ public final class TasteForMayhem extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+0. diff --git a/Mage.Sets/src/mage/cards/t/TattooWard.java b/Mage.Sets/src/mage/cards/t/TattooWard.java index bd2d801d4e1..3d3f49760cc 100644 --- a/Mage.Sets/src/mage/cards/t/TattooWard.java +++ b/Mage.Sets/src/mage/cards/t/TattooWard.java @@ -33,7 +33,7 @@ public final class TattooWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1 and has protection from enchantments. This effect doesn't remove Tattoo Ward. Ability ability = new SimpleStaticAbility(new BoostEnchantedEffect( diff --git a/Mage.Sets/src/mage/cards/t/TeferisCurse.java b/Mage.Sets/src/mage/cards/t/TeferisCurse.java index 305e1e5e782..21cc4184717 100644 --- a/Mage.Sets/src/mage/cards/t/TeferisCurse.java +++ b/Mage.Sets/src/mage/cards/t/TeferisCurse.java @@ -37,7 +37,7 @@ public final class TeferisCurse extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted permanent has phasing. diff --git a/Mage.Sets/src/mage/cards/t/TemporalIsolation.java b/Mage.Sets/src/mage/cards/t/TemporalIsolation.java index 100de54f363..8d0dcfd8018 100644 --- a/Mage.Sets/src/mage/cards/t/TemporalIsolation.java +++ b/Mage.Sets/src/mage/cards/t/TemporalIsolation.java @@ -37,7 +37,7 @@ public final class TemporalIsolation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has shadow. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShadowAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/t/TemurRunemark.java b/Mage.Sets/src/mage/cards/t/TemurRunemark.java index bc382ec5da9..6c203849a74 100644 --- a/Mage.Sets/src/mage/cards/t/TemurRunemark.java +++ b/Mage.Sets/src/mage/cards/t/TemurRunemark.java @@ -46,7 +46,7 @@ public final class TemurRunemark extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/t/TenuousTruce.java b/Mage.Sets/src/mage/cards/t/TenuousTruce.java index 39d17718d4e..fc77e9621bd 100644 --- a/Mage.Sets/src/mage/cards/t/TenuousTruce.java +++ b/Mage.Sets/src/mage/cards/t/TenuousTruce.java @@ -29,10 +29,10 @@ public class TenuousTruce extends CardImpl { this.addSubType(SubType.AURA); // Enchant opponent - TargetPlayer targetOpponent = new TargetOpponent(); - this.getSpellAbility().addTarget(targetOpponent); + TargetPlayer auraTarget = new TargetOpponent(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); - this.addAbility(new EnchantAbility(targetOpponent.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of enchanted opponent’s end step, you and that player each draw a card. Ability drawAbility = new BeginningOfEndStepTriggeredAbility( @@ -119,4 +119,4 @@ class TenuousTruceAttackTriggeredAbility extends TriggeredAbilityImpl { public TenuousTruceAttackTriggeredAbility copy() { return new TenuousTruceAttackTriggeredAbility(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java b/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java index 9c63e1f34a5..a9f5e70c08a 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsTouch.java @@ -35,7 +35,7 @@ public final class TezzeretsTouch extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types. @@ -54,4 +54,4 @@ public final class TezzeretsTouch extends CardImpl { public TezzeretsTouch copy() { return new TezzeretsTouch(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TheBrute.java b/Mage.Sets/src/mage/cards/t/TheBrute.java index 3ad37eb408c..8aef9e9115f 100644 --- a/Mage.Sets/src/mage/cards/t/TheBrute.java +++ b/Mage.Sets/src/mage/cards/t/TheBrute.java @@ -32,7 +32,7 @@ public final class TheBrute extends CardImpl { TargetCreaturePermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - EnchantAbility ability = new EnchantAbility(auraTarget.getTargetName()); + EnchantAbility ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0. diff --git a/Mage.Sets/src/mage/cards/t/Thirst.java b/Mage.Sets/src/mage/cards/t/Thirst.java index f3ea8ae7f56..99cd9aaaf74 100644 --- a/Mage.Sets/src/mage/cards/t/Thirst.java +++ b/Mage.Sets/src/mage/cards/t/Thirst.java @@ -35,7 +35,7 @@ public final class Thirst extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Thirst enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); // Enchanted creature doesn't untap during its controller's untap step. diff --git a/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java b/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java index 4e634833649..dfdeca389f3 100644 --- a/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java +++ b/Mage.Sets/src/mage/cards/t/ThreadsOfDisloyalty.java @@ -41,7 +41,7 @@ public final class ThreadsOfDisloyalty extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java index 3f45174a08b..15389b938d3 100644 --- a/Mage.Sets/src/mage/cards/t/ThrullRetainer.java +++ b/Mage.Sets/src/mage/cards/t/ThrullRetainer.java @@ -35,7 +35,7 @@ public final class ThrullRetainer extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/t/ThunderousMight.java b/Mage.Sets/src/mage/cards/t/ThunderousMight.java index 178807b294f..7d226c49fd2 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderousMight.java +++ b/Mage.Sets/src/mage/cards/t/ThunderousMight.java @@ -28,7 +28,7 @@ public final class ThunderousMight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, it gets +X/+0 until end of turn, where X is your devotion to red. diff --git a/Mage.Sets/src/mage/cards/t/TigerClaws.java b/Mage.Sets/src/mage/cards/t/TigerClaws.java index c16c881f77b..825607751f6 100644 --- a/Mage.Sets/src/mage/cards/t/TigerClaws.java +++ b/Mage.Sets/src/mage/cards/t/TigerClaws.java @@ -38,7 +38,7 @@ public final class TigerClaws extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and has trample. diff --git a/Mage.Sets/src/mage/cards/t/TighteningCoils.java b/Mage.Sets/src/mage/cards/t/TighteningCoils.java index 0ac715e970d..83d0ab2725d 100644 --- a/Mage.Sets/src/mage/cards/t/TighteningCoils.java +++ b/Mage.Sets/src/mage/cards/t/TighteningCoils.java @@ -35,7 +35,7 @@ public final class TighteningCoils extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -6/-0 and loses flying. diff --git a/Mage.Sets/src/mage/cards/t/TilonallisCrown.java b/Mage.Sets/src/mage/cards/t/TilonallisCrown.java index 4edccc2590a..a8cde4c15c1 100644 --- a/Mage.Sets/src/mage/cards/t/TilonallisCrown.java +++ b/Mage.Sets/src/mage/cards/t/TilonallisCrown.java @@ -37,7 +37,7 @@ public final class TilonallisCrown extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Tilonalli's Crown enters the battlefield, it deals 1 damage to enchanted creature. diff --git a/Mage.Sets/src/mage/cards/t/TimelyWard.java b/Mage.Sets/src/mage/cards/t/TimelyWard.java index b0fa57a0c91..8bdcaba560c 100644 --- a/Mage.Sets/src/mage/cards/t/TimelyWard.java +++ b/Mage.Sets/src/mage/cards/t/TimelyWard.java @@ -46,7 +46,7 @@ public final class TimelyWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has indestructible. diff --git a/Mage.Sets/src/mage/cards/t/TinStreetMarket.java b/Mage.Sets/src/mage/cards/t/TinStreetMarket.java index afcd7f644b1..23fd504c25d 100644 --- a/Mage.Sets/src/mage/cards/t/TinStreetMarket.java +++ b/Mage.Sets/src/mage/cards/t/TinStreetMarket.java @@ -33,7 +33,7 @@ public final class TinStreetMarket extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/Torment.java b/Mage.Sets/src/mage/cards/t/Torment.java index f830cb73aaf..0959bb55c02 100644 --- a/Mage.Sets/src/mage/cards/t/Torment.java +++ b/Mage.Sets/src/mage/cards/t/Torment.java @@ -31,7 +31,7 @@ public final class Torment extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-0. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3, 0, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java b/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java index 5884bfe634d..4c7e4e26ed8 100644 --- a/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java +++ b/Mage.Sets/src/mage/cards/t/TormentOfScarabs.java @@ -35,7 +35,7 @@ public final class TormentOfScarabs extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseLife)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of enchanted player's upkeep, that player loses 3 life unless they sacrifice a nonland permanent or discards a card. diff --git a/Mage.Sets/src/mage/cards/t/TorporDust.java b/Mage.Sets/src/mage/cards/t/TorporDust.java index e12b5545f32..91d2e012773 100644 --- a/Mage.Sets/src/mage/cards/t/TorporDust.java +++ b/Mage.Sets/src/mage/cards/t/TorporDust.java @@ -36,7 +36,7 @@ public final class TorporDust extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-0. diff --git a/Mage.Sets/src/mage/cards/t/Torture.java b/Mage.Sets/src/mage/cards/t/Torture.java index 482fde8087d..588509fa783 100644 --- a/Mage.Sets/src/mage/cards/t/Torture.java +++ b/Mage.Sets/src/mage/cards/t/Torture.java @@ -36,7 +36,7 @@ public final class Torture extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {1}{B}: Put a -1/-1 counter on enchanted creature. diff --git a/Mage.Sets/src/mage/cards/t/TourachsGate.java b/Mage.Sets/src/mage/cards/t/TourachsGate.java index 73afa693671..7e87d1f7998 100644 --- a/Mage.Sets/src/mage/cards/t/TourachsGate.java +++ b/Mage.Sets/src/mage/cards/t/TourachsGate.java @@ -71,7 +71,7 @@ public final class TourachsGate extends CardImpl { TargetPermanent auraTarget = new TargetControlledPermanent(filterLand); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Sacrifice a Thrull: Put three time counters on Tourach's Gate. diff --git a/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java b/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java index 2fac89bfa67..acf6c87f0ab 100644 --- a/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java +++ b/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java @@ -29,7 +29,7 @@ public final class TraceOfAbundance extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has shroud. diff --git a/Mage.Sets/src/mage/cards/t/TrappedInTheTower.java b/Mage.Sets/src/mage/cards/t/TrappedInTheTower.java index 407eb71cfe6..963c7829927 100644 --- a/Mage.Sets/src/mage/cards/t/TrappedInTheTower.java +++ b/Mage.Sets/src/mage/cards/t/TrappedInTheTower.java @@ -38,7 +38,7 @@ public final class TrappedInTheTower extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.LoseAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/t/TravelersCloak.java b/Mage.Sets/src/mage/cards/t/TravelersCloak.java index 230c7c34567..87301a0873e 100644 --- a/Mage.Sets/src/mage/cards/t/TravelersCloak.java +++ b/Mage.Sets/src/mage/cards/t/TravelersCloak.java @@ -45,7 +45,7 @@ public final class TravelersCloak extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As Traveler's Cloak enters the battlefield, choose a land type. diff --git a/Mage.Sets/src/mage/cards/t/TravelingPlague.java b/Mage.Sets/src/mage/cards/t/TravelingPlague.java index d6d7dbcfd84..568f6dc6b0a 100644 --- a/Mage.Sets/src/mage/cards/t/TravelingPlague.java +++ b/Mage.Sets/src/mage/cards/t/TravelingPlague.java @@ -43,7 +43,7 @@ public final class TravelingPlague extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of each upkeep, put a plague counter on Traveling Plague. diff --git a/Mage.Sets/src/mage/cards/t/TreacherousLink.java b/Mage.Sets/src/mage/cards/t/TreacherousLink.java index 408d5d942c2..c51776c8b2f 100644 --- a/Mage.Sets/src/mage/cards/t/TreacherousLink.java +++ b/Mage.Sets/src/mage/cards/t/TreacherousLink.java @@ -35,7 +35,7 @@ public final class TreacherousLink extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // All damage that would be dealt to enchanted creature is dealt to its controller instead. diff --git a/Mage.Sets/src/mage/cards/t/Treachery.java b/Mage.Sets/src/mage/cards/t/Treachery.java index bbd21b62390..a20da3fe547 100644 --- a/Mage.Sets/src/mage/cards/t/Treachery.java +++ b/Mage.Sets/src/mage/cards/t/Treachery.java @@ -33,7 +33,7 @@ public final class Treachery extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Treachery enters the battlefield, untap up to five lands. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapLandsEffect(5))); diff --git a/Mage.Sets/src/mage/cards/t/TreefolkUmbra.java b/Mage.Sets/src/mage/cards/t/TreefolkUmbra.java index bf95cb155f5..dc16e0ff165 100644 --- a/Mage.Sets/src/mage/cards/t/TreefolkUmbra.java +++ b/Mage.Sets/src/mage/cards/t/TreefolkUmbra.java @@ -33,7 +33,7 @@ public final class TreefolkUmbra extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2 and assigns combat damage equal to its toughness rather than its power. @@ -93,4 +93,4 @@ class TreefolkUmbraEffect extends ContinuousEffectImpl { public boolean hasLayer(Layer layer) { return layer == Layer.RulesEffects; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/t/TreetopBracers.java b/Mage.Sets/src/mage/cards/t/TreetopBracers.java index c4f6dc72a55..18c0a8632bb 100644 --- a/Mage.Sets/src/mage/cards/t/TreetopBracers.java +++ b/Mage.Sets/src/mage/cards/t/TreetopBracers.java @@ -38,7 +38,7 @@ public final class TreetopBracers extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1 and can't be blocked except by creatures with flying. diff --git a/Mage.Sets/src/mage/cards/t/TrespassersCurse.java b/Mage.Sets/src/mage/cards/t/TrespassersCurse.java index b5322598b27..dceb6ba0504 100644 --- a/Mage.Sets/src/mage/cards/t/TrespassersCurse.java +++ b/Mage.Sets/src/mage/cards/t/TrespassersCurse.java @@ -36,7 +36,7 @@ public final class TrespassersCurse extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever a creature enters the battlefield under enchanted player's control, that player loses 1 life and you gain 1 life. diff --git a/Mage.Sets/src/mage/cards/t/TricksOfTheTrade.java b/Mage.Sets/src/mage/cards/t/TricksOfTheTrade.java index a77c7d2a4b2..5153bae3b98 100644 --- a/Mage.Sets/src/mage/cards/t/TricksOfTheTrade.java +++ b/Mage.Sets/src/mage/cards/t/TricksOfTheTrade.java @@ -30,10 +30,10 @@ public final class TricksOfTheTrade extends CardImpl { // Enchant creature - TargetPermanent target = new TargetCreaturePermanent(); - this.getSpellAbility().addTarget(target); + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(target.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +2/+0 and can't be blocked. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 0, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/t/TriclopeanSight.java b/Mage.Sets/src/mage/cards/t/TriclopeanSight.java index 703c7e027c3..7b375b11bf1 100644 --- a/Mage.Sets/src/mage/cards/t/TriclopeanSight.java +++ b/Mage.Sets/src/mage/cards/t/TriclopeanSight.java @@ -34,7 +34,7 @@ public final class TriclopeanSight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Neutral)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Triclopean Sight enters the battlefield, untap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/t/Trollhide.java b/Mage.Sets/src/mage/cards/t/Trollhide.java index 1f0115030e3..b9d8a450ea7 100644 --- a/Mage.Sets/src/mage/cards/t/Trollhide.java +++ b/Mage.Sets/src/mage/cards/t/Trollhide.java @@ -38,7 +38,7 @@ public final class Trollhide extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has "{1}{G}: Regenerate this creature." diff --git a/Mage.Sets/src/mage/cards/t/TwinbladeInvocation.java b/Mage.Sets/src/mage/cards/t/TwinbladeInvocation.java index fa73595eb2d..93415a4b48b 100644 --- a/Mage.Sets/src/mage/cards/t/TwinbladeInvocation.java +++ b/Mage.Sets/src/mage/cards/t/TwinbladeInvocation.java @@ -35,7 +35,7 @@ public final class TwinbladeInvocation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has double strike. diff --git a/Mage.Sets/src/mage/cards/t/TwistedEmbrace.java b/Mage.Sets/src/mage/cards/t/TwistedEmbrace.java index c98e9d36019..cacb667d41d 100644 --- a/Mage.Sets/src/mage/cards/t/TwistedEmbrace.java +++ b/Mage.Sets/src/mage/cards/t/TwistedEmbrace.java @@ -47,7 +47,7 @@ public final class TwistedEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT_OR_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Twisted Embrace enters the battlefield, destroy target creature or planeswalker an opponent controls. Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/t/TwistedExperiment.java b/Mage.Sets/src/mage/cards/t/TwistedExperiment.java index e6541ef2698..12e4c4a9765 100644 --- a/Mage.Sets/src/mage/cards/t/TwistedExperiment.java +++ b/Mage.Sets/src/mage/cards/t/TwistedExperiment.java @@ -32,7 +32,7 @@ public final class TwistedExperiment extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, -1, Duration.WhileOnBattlefield))); } diff --git a/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java b/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java index ae5b72bc3d9..917887196b9 100644 --- a/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java +++ b/Mage.Sets/src/mage/cards/u/UnbridledGrowth.java @@ -38,7 +38,7 @@ public final class UnbridledGrowth extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Add one mana of any color." diff --git a/Mage.Sets/src/mage/cards/u/UncontrollableAnger.java b/Mage.Sets/src/mage/cards/u/UncontrollableAnger.java index 02b7de1005f..5c3e6d07ad6 100644 --- a/Mage.Sets/src/mage/cards/u/UncontrollableAnger.java +++ b/Mage.Sets/src/mage/cards/u/UncontrollableAnger.java @@ -38,7 +38,7 @@ public final class UncontrollableAnger extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and attacks each turn if able. diff --git a/Mage.Sets/src/mage/cards/u/UncontrolledInfestation.java b/Mage.Sets/src/mage/cards/u/UncontrolledInfestation.java index f9b84af3ed2..738326beb54 100644 --- a/Mage.Sets/src/mage/cards/u/UncontrolledInfestation.java +++ b/Mage.Sets/src/mage/cards/u/UncontrolledInfestation.java @@ -28,7 +28,7 @@ public final class UncontrolledInfestation extends CardImpl { TargetPermanent auraTarget = new TargetNonBasicLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted land becomes tapped, destroy it. this.addAbility(new BecomesTappedAttachedTriggeredAbility(new DestroyAttachedToEffect("it"), "enchanted land")); diff --git a/Mage.Sets/src/mage/cards/u/UnderworldConnections.java b/Mage.Sets/src/mage/cards/u/UnderworldConnections.java index f91d1c3d191..770c6df6d8d 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldConnections.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldConnections.java @@ -40,7 +40,7 @@ public final class UnderworldConnections extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.DrawCard)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}, Pay 1 life: Draw a card." diff --git a/Mage.Sets/src/mage/cards/u/UndyingRage.java b/Mage.Sets/src/mage/cards/u/UndyingRage.java index 5001fe21491..4c199ef5a50 100644 --- a/Mage.Sets/src/mage/cards/u/UndyingRage.java +++ b/Mage.Sets/src/mage/cards/u/UndyingRage.java @@ -37,7 +37,7 @@ public final class UndyingRage extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and can't block. diff --git a/Mage.Sets/src/mage/cards/u/UnflinchingCourage.java b/Mage.Sets/src/mage/cards/u/UnflinchingCourage.java index 7f8c8a94c72..45bcfd5af7a 100644 --- a/Mage.Sets/src/mage/cards/u/UnflinchingCourage.java +++ b/Mage.Sets/src/mage/cards/u/UnflinchingCourage.java @@ -35,7 +35,7 @@ public final class UnflinchingCourage extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has trample and lifelink. diff --git a/Mage.Sets/src/mage/cards/u/UnhallowedPact.java b/Mage.Sets/src/mage/cards/u/UnhallowedPact.java index c9e14cd3963..a75873e9c8e 100644 --- a/Mage.Sets/src/mage/cards/u/UnhallowedPact.java +++ b/Mage.Sets/src/mage/cards/u/UnhallowedPact.java @@ -29,7 +29,7 @@ public final class UnhallowedPact extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, return that card to the battlefield under your control. diff --git a/Mage.Sets/src/mage/cards/u/UnholyIndenture.java b/Mage.Sets/src/mage/cards/u/UnholyIndenture.java index facfc89176f..ba308218be3 100644 --- a/Mage.Sets/src/mage/cards/u/UnholyIndenture.java +++ b/Mage.Sets/src/mage/cards/u/UnholyIndenture.java @@ -36,7 +36,7 @@ public final class UnholyIndenture extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When enchanted creature dies, return that card to the battlefield under your control with a +1/+1 counter on it. @@ -90,4 +90,4 @@ class UnholyIndentureReturnEffect extends OneShotEffect { return false; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/u/UnholyStrength.java b/Mage.Sets/src/mage/cards/u/UnholyStrength.java index caf428dd068..cdf98d16380 100644 --- a/Mage.Sets/src/mage/cards/u/UnholyStrength.java +++ b/Mage.Sets/src/mage/cards/u/UnholyStrength.java @@ -31,7 +31,7 @@ public final class UnholyStrength extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/u/UnnaturalHunger.java b/Mage.Sets/src/mage/cards/u/UnnaturalHunger.java index fe5866f0bfb..413de477d0a 100644 --- a/Mage.Sets/src/mage/cards/u/UnnaturalHunger.java +++ b/Mage.Sets/src/mage/cards/u/UnnaturalHunger.java @@ -39,7 +39,7 @@ public final class UnnaturalHunger extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // At the beginning of the upkeep of enchanted creature's controller, Unnatural Hunger deals damage to that player equal to that creature's power unless they sacrifice another creature. diff --git a/Mage.Sets/src/mage/cards/u/UnquenchableFury.java b/Mage.Sets/src/mage/cards/u/UnquenchableFury.java index 282ad79c8da..3b00622232e 100644 --- a/Mage.Sets/src/mage/cards/u/UnquenchableFury.java +++ b/Mage.Sets/src/mage/cards/u/UnquenchableFury.java @@ -36,7 +36,7 @@ public final class UnquenchableFury extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has "Whenever this creature attacks, it deals X damage to defending player, where X is the number of cards in their hand." this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(new AttacksTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java b/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java index c826269c660..6dfcbb3fb7c 100644 --- a/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java +++ b/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java @@ -33,7 +33,7 @@ public final class UnquenchableThirst extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Unquenchable Thirst enters the battlefield, if you control a Desert or there is a Desert card in your graveyard, tap enchanted creature. this.addAbility(new ConditionalInterveningIfTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java b/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java index f840ea0ca81..1153e80ee97 100644 --- a/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java +++ b/Mage.Sets/src/mage/cards/u/UnquestionedAuthority.java @@ -35,7 +35,7 @@ public final class UnquestionedAuthority extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Unquestioned Authority enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/u/UnstableMutation.java b/Mage.Sets/src/mage/cards/u/UnstableMutation.java index 33bf320e6aa..d693bbec69b 100644 --- a/Mage.Sets/src/mage/cards/u/UnstableMutation.java +++ b/Mage.Sets/src/mage/cards/u/UnstableMutation.java @@ -35,7 +35,7 @@ public final class UnstableMutation extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3))); diff --git a/Mage.Sets/src/mage/cards/u/UntamedHunger.java b/Mage.Sets/src/mage/cards/u/UntamedHunger.java index 38048d27704..afa8b15c3c1 100644 --- a/Mage.Sets/src/mage/cards/u/UntamedHunger.java +++ b/Mage.Sets/src/mage/cards/u/UntamedHunger.java @@ -34,7 +34,7 @@ public final class UntamedHunger extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+1 and has menace. diff --git a/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java b/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java index bbf58561d1c..4f3b2484ca8 100644 --- a/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java +++ b/Mage.Sets/src/mage/cards/u/UrbanBurgeoning.java @@ -32,7 +32,7 @@ public final class UrbanBurgeoning extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "Untap this land during each other player's untap step." diff --git a/Mage.Sets/src/mage/cards/u/UrbanUtopia.java b/Mage.Sets/src/mage/cards/u/UrbanUtopia.java index 95b0a16da0a..1de58fe0dbf 100644 --- a/Mage.Sets/src/mage/cards/u/UrbanUtopia.java +++ b/Mage.Sets/src/mage/cards/u/UrbanUtopia.java @@ -34,7 +34,7 @@ public final class UrbanUtopia extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Urban Utopia enters the battlefield, draw a card. diff --git a/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java b/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java index 206a9813d23..0739c77e012 100644 --- a/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java +++ b/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java @@ -39,7 +39,7 @@ public final class UtopiaSprawl extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As Utopia Sprawl enters the battlefield, choose a color. diff --git a/Mage.Sets/src/mage/cards/u/UtopiaVow.java b/Mage.Sets/src/mage/cards/u/UtopiaVow.java index 83675055a49..c1fcf371065 100644 --- a/Mage.Sets/src/mage/cards/u/UtopiaVow.java +++ b/Mage.Sets/src/mage/cards/u/UtopiaVow.java @@ -35,7 +35,7 @@ public final class UtopiaVow extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block. diff --git a/Mage.Sets/src/mage/cards/v/ValorOfTheWorthy.java b/Mage.Sets/src/mage/cards/v/ValorOfTheWorthy.java index ce69c489717..df6df842e0c 100644 --- a/Mage.Sets/src/mage/cards/v/ValorOfTheWorthy.java +++ b/Mage.Sets/src/mage/cards/v/ValorOfTheWorthy.java @@ -36,7 +36,7 @@ public final class ValorOfTheWorthy extends CardImpl { TargetCreaturePermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/v/VampiricEmbrace.java b/Mage.Sets/src/mage/cards/v/VampiricEmbrace.java index 36e3c78252d..58ea09e5157 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricEmbrace.java +++ b/Mage.Sets/src/mage/cards/v/VampiricEmbrace.java @@ -37,7 +37,7 @@ public final class VampiricEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); diff --git a/Mage.Sets/src/mage/cards/v/VampiricLink.java b/Mage.Sets/src/mage/cards/v/VampiricLink.java index 0913cec0350..3ab9e73a69b 100644 --- a/Mage.Sets/src/mage/cards/v/VampiricLink.java +++ b/Mage.Sets/src/mage/cards/v/VampiricLink.java @@ -30,7 +30,7 @@ public final class VampiricLink extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Whenever enchanted creature deals damage, you gain that much life. this.addAbility(new DealsDamageAttachedTriggeredAbility(Zone.BATTLEFIELD, new GainLifeEffect(SavedDamageValue.MUCH), false)); diff --git a/Mage.Sets/src/mage/cards/v/Vampirism.java b/Mage.Sets/src/mage/cards/v/Vampirism.java index bfcd2f3759a..82c45df60af 100644 --- a/Mage.Sets/src/mage/cards/v/Vampirism.java +++ b/Mage.Sets/src/mage/cards/v/Vampirism.java @@ -36,7 +36,7 @@ public final class Vampirism extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Vampirism enters the battlefield, draw a card at the beginning of the next turn's upkeep. diff --git a/Mage.Sets/src/mage/cards/v/Vanishing.java b/Mage.Sets/src/mage/cards/v/Vanishing.java index 2ab5c0fd9df..eb6866c3d45 100644 --- a/Mage.Sets/src/mage/cards/v/Vanishing.java +++ b/Mage.Sets/src/mage/cards/v/Vanishing.java @@ -31,7 +31,7 @@ public final class Vanishing extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {U}{U}: Enchanted creature phases out. diff --git a/Mage.Sets/src/mage/cards/v/VaporSnare.java b/Mage.Sets/src/mage/cards/v/VaporSnare.java index 8d2070ecf4c..8a222ff08fa 100644 --- a/Mage.Sets/src/mage/cards/v/VaporSnare.java +++ b/Mage.Sets/src/mage/cards/v/VaporSnare.java @@ -39,7 +39,7 @@ public final class VaporSnare extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. diff --git a/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java b/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java index 8f82d396043..dbb9c1c9f7a 100644 --- a/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java +++ b/Mage.Sets/src/mage/cards/v/VastwoodZendikon.java @@ -35,7 +35,7 @@ public final class VastwoodZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( @@ -55,4 +55,4 @@ public final class VastwoodZendikon extends CardImpl { public VastwoodZendikon copy() { return new VastwoodZendikon(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/v/VenarianGold.java b/Mage.Sets/src/mage/cards/v/VenarianGold.java index 7321f160dbe..7bd6453fdf5 100644 --- a/Mage.Sets/src/mage/cards/v/VenarianGold.java +++ b/Mage.Sets/src/mage/cards/v/VenarianGold.java @@ -38,7 +38,7 @@ public final class VenarianGold extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Venarian Gold enters the battlefield, tap enchanted creature and put X sleep counters on it. Ability ability = new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect()); diff --git a/Mage.Sets/src/mage/cards/v/Venom.java b/Mage.Sets/src/mage/cards/v/Venom.java index a1106e9dce1..3a701cc3627 100644 --- a/Mage.Sets/src/mage/cards/v/Venom.java +++ b/Mage.Sets/src/mage/cards/v/Venom.java @@ -36,7 +36,7 @@ public final class Venom extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature blocks or becomes blocked by a non-Wall creature, destroy the other creature at end of combat. diff --git a/Mage.Sets/src/mage/cards/v/VenomousFangs.java b/Mage.Sets/src/mage/cards/v/VenomousFangs.java index 60d94e6ba33..ebdb5ef2a61 100644 --- a/Mage.Sets/src/mage/cards/v/VenomousFangs.java +++ b/Mage.Sets/src/mage/cards/v/VenomousFangs.java @@ -29,7 +29,7 @@ public final class VenomousFangs extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature deals damage to a creature, destroy the other creature. diff --git a/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java b/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java index c56781d2bed..451012a3c01 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java +++ b/Mage.Sets/src/mage/cards/v/VerdantEmbrace.java @@ -38,7 +38,7 @@ public final class VerdantEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3 and has "At the beginning of each upkeep, create a 1/1 green Saproling creature token." ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(3, 3, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/v/VerdantField.java b/Mage.Sets/src/mage/cards/v/VerdantField.java index d56ce3f8fe8..289cb616a29 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantField.java +++ b/Mage.Sets/src/mage/cards/v/VerdantField.java @@ -32,7 +32,7 @@ public final class VerdantField extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted land has "{T}: Target creature gets +1/+1 until end of turn." diff --git a/Mage.Sets/src/mage/cards/v/VerdantHaven.java b/Mage.Sets/src/mage/cards/v/VerdantHaven.java index 644dab718d3..5f2c159b317 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantHaven.java +++ b/Mage.Sets/src/mage/cards/v/VerdantHaven.java @@ -31,7 +31,7 @@ public final class VerdantHaven extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Verdant Haven enters the battlefield, you gain 2 life. diff --git a/Mage.Sets/src/mage/cards/v/VeteransVoice.java b/Mage.Sets/src/mage/cards/v/VeteransVoice.java index b8e8cec615e..fc36117feea 100644 --- a/Mage.Sets/src/mage/cards/v/VeteransVoice.java +++ b/Mage.Sets/src/mage/cards/v/VeteransVoice.java @@ -45,7 +45,7 @@ public final class VeteransVoice extends CardImpl { TargetPermanent auraTarget = new TargetControlledCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Tap enchanted creature: Target creature other than the creature tapped this way gets +2/+1 until end of turn. Activate this ability only if enchanted creature is untapped. this.addAbility(new ActivateIfConditionActivatedAbility( diff --git a/Mage.Sets/src/mage/cards/v/Vigilance.java b/Mage.Sets/src/mage/cards/v/Vigilance.java index f2ef42770ef..5ce03bdf827 100644 --- a/Mage.Sets/src/mage/cards/v/Vigilance.java +++ b/Mage.Sets/src/mage/cards/v/Vigilance.java @@ -25,7 +25,7 @@ public final class Vigilance extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(), AttachmentType.AURA))); } diff --git a/Mage.Sets/src/mage/cards/v/Vineweft.java b/Mage.Sets/src/mage/cards/v/Vineweft.java index 7e3f6d3d19c..b6102395e00 100644 --- a/Mage.Sets/src/mage/cards/v/Vineweft.java +++ b/Mage.Sets/src/mage/cards/v/Vineweft.java @@ -35,7 +35,7 @@ public final class Vineweft extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. diff --git a/Mage.Sets/src/mage/cards/v/VipersKiss.java b/Mage.Sets/src/mage/cards/v/VipersKiss.java index 7482e08ac79..cbdc8ac4a32 100644 --- a/Mage.Sets/src/mage/cards/v/VipersKiss.java +++ b/Mage.Sets/src/mage/cards/v/VipersKiss.java @@ -34,7 +34,7 @@ public final class VipersKiss extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -1/-1 and its activated abilities can't be activated. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-1,-1, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/v/ViridianHarvest.java b/Mage.Sets/src/mage/cards/v/ViridianHarvest.java index e87ae1e3a83..4bf31de43bf 100644 --- a/Mage.Sets/src/mage/cards/v/ViridianHarvest.java +++ b/Mage.Sets/src/mage/cards/v/ViridianHarvest.java @@ -29,7 +29,7 @@ public final class ViridianHarvest extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new DiesAttachedTriggeredAbility(new GainLifeEffect(6), "enchanted artifact", false, false)); diff --git a/Mage.Sets/src/mage/cards/v/VisceridArmor.java b/Mage.Sets/src/mage/cards/v/VisceridArmor.java index 0377d82c724..ae1e7db6ad2 100644 --- a/Mage.Sets/src/mage/cards/v/VisceridArmor.java +++ b/Mage.Sets/src/mage/cards/v/VisceridArmor.java @@ -34,7 +34,7 @@ public final class VisceridArmor extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/v/VisionsOfBrutality.java b/Mage.Sets/src/mage/cards/v/VisionsOfBrutality.java index aa6ba2c3148..dffb8be6c5a 100644 --- a/Mage.Sets/src/mage/cards/v/VisionsOfBrutality.java +++ b/Mage.Sets/src/mage/cards/v/VisionsOfBrutality.java @@ -38,7 +38,7 @@ public final class VisionsOfBrutality extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't block. diff --git a/Mage.Sets/src/mage/cards/v/VolcanicStrength.java b/Mage.Sets/src/mage/cards/v/VolcanicStrength.java index 47c716ef668..6d9dcbdd39b 100644 --- a/Mage.Sets/src/mage/cards/v/VolcanicStrength.java +++ b/Mage.Sets/src/mage/cards/v/VolcanicStrength.java @@ -34,7 +34,7 @@ public final class VolcanicStrength extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has mountainwalk. diff --git a/Mage.Sets/src/mage/cards/v/VolitionReins.java b/Mage.Sets/src/mage/cards/v/VolitionReins.java index ed21535036d..8d17413c100 100644 --- a/Mage.Sets/src/mage/cards/v/VolitionReins.java +++ b/Mage.Sets/src/mage/cards/v/VolitionReins.java @@ -33,7 +33,7 @@ public final class VolitionReins extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Volition Reins enters the battlefield, if enchanted permanent is tapped, untap it. this.addAbility(new EntersBattlefieldTriggeredAbility(new UntapVolitionReinsEffect())); diff --git a/Mage.Sets/src/mage/cards/v/VolrathsCurse.java b/Mage.Sets/src/mage/cards/v/VolrathsCurse.java index 35c757ee0ea..ab6a8a5322b 100644 --- a/Mage.Sets/src/mage/cards/v/VolrathsCurse.java +++ b/Mage.Sets/src/mage/cards/v/VolrathsCurse.java @@ -42,7 +42,7 @@ public final class VolrathsCurse extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack or block, and its activated abilities can't be activated. That creature's controller may sacrifice a permanent for that player to ignore this effect until end of turn. diff --git a/Mage.Sets/src/mage/cards/v/VowOfDuty.java b/Mage.Sets/src/mage/cards/v/VowOfDuty.java index e3fb89591c8..f3edb4a8ce2 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfDuty.java +++ b/Mage.Sets/src/mage/cards/v/VowOfDuty.java @@ -37,7 +37,7 @@ public final class VowOfDuty extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has vigilance, and can't attack you or a planeswalker you control. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/v/VowOfFlight.java b/Mage.Sets/src/mage/cards/v/VowOfFlight.java index 7ec8c6ba9e3..7a2a4d7bd11 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfFlight.java +++ b/Mage.Sets/src/mage/cards/v/VowOfFlight.java @@ -37,7 +37,7 @@ public final class VowOfFlight extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has flying, and can't attack you or a planeswalker you control. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/v/VowOfLightning.java b/Mage.Sets/src/mage/cards/v/VowOfLightning.java index a2133bcd8a1..56e125397dc 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfLightning.java +++ b/Mage.Sets/src/mage/cards/v/VowOfLightning.java @@ -37,7 +37,7 @@ public final class VowOfLightning extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has first strike, and can't attack you or a planeswalker you control. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/v/VowOfMalice.java b/Mage.Sets/src/mage/cards/v/VowOfMalice.java index c1333be375f..89d7b90167d 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfMalice.java +++ b/Mage.Sets/src/mage/cards/v/VowOfMalice.java @@ -37,7 +37,7 @@ public final class VowOfMalice extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has intimidate, and can't attack you or a planeswalker you control. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2,2,Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/v/VowOfTorment.java b/Mage.Sets/src/mage/cards/v/VowOfTorment.java index 1e87bcd9cf8..70864be6a1a 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfTorment.java +++ b/Mage.Sets/src/mage/cards/v/VowOfTorment.java @@ -30,7 +30,7 @@ public final class VowOfTorment extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2, has menace, and can't attack you or a planeswalker you control. diff --git a/Mage.Sets/src/mage/cards/v/VowOfWildness.java b/Mage.Sets/src/mage/cards/v/VowOfWildness.java index 2ef58cd2fe3..cdec8303c93 100644 --- a/Mage.Sets/src/mage/cards/v/VowOfWildness.java +++ b/Mage.Sets/src/mage/cards/v/VowOfWildness.java @@ -37,7 +37,7 @@ public final class VowOfWildness extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +3/+3, has trample, and can't attack you or a planeswalker you control. diff --git a/Mage.Sets/src/mage/cards/w/Wanderlust.java b/Mage.Sets/src/mage/cards/w/Wanderlust.java index 9763129ecbc..eaed602235f 100644 --- a/Mage.Sets/src/mage/cards/w/Wanderlust.java +++ b/Mage.Sets/src/mage/cards/w/Wanderlust.java @@ -31,7 +31,7 @@ public final class Wanderlust extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of the upkeep of enchanted creature's controller, Wanderlust deals 1 damage to that player. Effect effect = new DamageTargetEffect(1); effect.setText("{this} deals 1 damage to that player"); diff --git a/Mage.Sets/src/mage/cards/w/WarbriarBlessing.java b/Mage.Sets/src/mage/cards/w/WarbriarBlessing.java index 69174fca26b..ee17f2c4a7b 100644 --- a/Mage.Sets/src/mage/cards/w/WarbriarBlessing.java +++ b/Mage.Sets/src/mage/cards/w/WarbriarBlessing.java @@ -33,7 +33,7 @@ public final class WarbriarBlessing extends CardImpl { TargetPermanent auraTarget = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_CREATURE); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Warbriar Blessing enters the battlefield, enchanted creature fights up to one target creature you don't control. diff --git a/Mage.Sets/src/mage/cards/w/WardOfLights.java b/Mage.Sets/src/mage/cards/w/WardOfLights.java index adfbc49e52f..e149a6a65eb 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfLights.java +++ b/Mage.Sets/src/mage/cards/w/WardOfLights.java @@ -38,7 +38,7 @@ public final class WardOfLights extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // As Ward of Lights enters the battlefield, choose a color. this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Benefit))); diff --git a/Mage.Sets/src/mage/cards/w/WardOfPiety.java b/Mage.Sets/src/mage/cards/w/WardOfPiety.java index ff23225d6b1..793871a502d 100644 --- a/Mage.Sets/src/mage/cards/w/WardOfPiety.java +++ b/Mage.Sets/src/mage/cards/w/WardOfPiety.java @@ -37,7 +37,7 @@ public final class WardOfPiety extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PreventDamage)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // {1}{W}: The next 1 damage that would be dealt to enchanted creature this turn is dealt to any target instead. diff --git a/Mage.Sets/src/mage/cards/w/WarpArtifact.java b/Mage.Sets/src/mage/cards/w/WarpArtifact.java index 8318d5150d0..4dfb309f861 100644 --- a/Mage.Sets/src/mage/cards/w/WarpArtifact.java +++ b/Mage.Sets/src/mage/cards/w/WarpArtifact.java @@ -31,7 +31,7 @@ public final class WarpArtifact extends CardImpl { TargetPermanent auraTarget = new TargetArtifactPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // At the beginning of the upkeep of enchanted artifact's controller, Warp Artifact deals 1 damage to that player. Effect effect = new DamageTargetEffect(1); effect.setText("{this} deals 1 damage to that player"); diff --git a/Mage.Sets/src/mage/cards/w/Waterknot.java b/Mage.Sets/src/mage/cards/w/Waterknot.java index 7e071ccf367..55c421ea57c 100644 --- a/Mage.Sets/src/mage/cards/w/Waterknot.java +++ b/Mage.Sets/src/mage/cards/w/Waterknot.java @@ -30,7 +30,7 @@ public final class Waterknot extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Waterknot enters the battlefield, tap enchanted creature. this.addAbility(new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java index bbb231fbc27..7eafe85cae1 100644 --- a/Mage.Sets/src/mage/cards/w/WayOfTheThief.java +++ b/Mage.Sets/src/mage/cards/w/WayOfTheThief.java @@ -40,7 +40,7 @@ public final class WayOfTheThief extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2. diff --git a/Mage.Sets/src/mage/cards/w/Weakness.java b/Mage.Sets/src/mage/cards/w/Weakness.java index e5a9142e42e..2d503f434b6 100644 --- a/Mage.Sets/src/mage/cards/w/Weakness.java +++ b/Mage.Sets/src/mage/cards/w/Weakness.java @@ -32,7 +32,7 @@ public final class Weakness extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -2/-1. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-2, -1, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/w/Web.java b/Mage.Sets/src/mage/cards/w/Web.java index 5ec098f718b..3734f104797 100644 --- a/Mage.Sets/src/mage/cards/w/Web.java +++ b/Mage.Sets/src/mage/cards/w/Web.java @@ -31,7 +31,7 @@ public final class Web extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +0/+2 and has reach. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(0, 2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java index f4e6c265ea0..0a62d39f97b 100644 --- a/Mage.Sets/src/mage/cards/w/WeightOfConscience.java +++ b/Mage.Sets/src/mage/cards/w/WeightOfConscience.java @@ -39,7 +39,7 @@ public final class WeightOfConscience extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't attack. diff --git a/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java b/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java index 2ef8e5b11ff..f225ffe82ad 100644 --- a/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java +++ b/Mage.Sets/src/mage/cards/w/WeightOfTheUnderworld.java @@ -32,7 +32,7 @@ public final class WeightOfTheUnderworld extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -3/-2. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(-3,-2, Duration.WhileOnBattlefield))); diff --git a/Mage.Sets/src/mage/cards/w/WeirdingWood.java b/Mage.Sets/src/mage/cards/w/WeirdingWood.java index ba4466c5245..c9b3319ef6b 100644 --- a/Mage.Sets/src/mage/cards/w/WeirdingWood.java +++ b/Mage.Sets/src/mage/cards/w/WeirdingWood.java @@ -37,7 +37,7 @@ public final class WeirdingWood extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When Weirding Wood enters the battlefield, investigate. this.addAbility(new EntersBattlefieldTriggeredAbility(new InvestigateEffect())); diff --git a/Mage.Sets/src/mage/cards/w/Wellspring.java b/Mage.Sets/src/mage/cards/w/Wellspring.java index 01345b8d942..4609b9debca 100644 --- a/Mage.Sets/src/mage/cards/w/Wellspring.java +++ b/Mage.Sets/src/mage/cards/w/Wellspring.java @@ -34,7 +34,7 @@ public final class Wellspring extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Wellspring enters the battlefield, gain control of enchanted land until end of turn. @@ -87,4 +87,4 @@ class WellspringEffect extends OneShotEffect { game.addEffect(effect, source); return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java b/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java index 8bc1dd2da75..20c738d718b 100644 --- a/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java +++ b/Mage.Sets/src/mage/cards/w/WheelOfSunAndMoon.java @@ -40,7 +40,7 @@ public final class WheelOfSunAndMoon extends CardImpl { TargetPlayer auraTarget = new TargetPlayer(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // If a card would be put into enchanted player's graveyard from anywhere, instead that card is revealed and put on the bottom of that player's library. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new WheelOfSunAndMoonEffect())); diff --git a/Mage.Sets/src/mage/cards/w/WhipSilk.java b/Mage.Sets/src/mage/cards/w/WhipSilk.java index 6847318a264..1a0f3c698d1 100644 --- a/Mage.Sets/src/mage/cards/w/WhipSilk.java +++ b/Mage.Sets/src/mage/cards/w/WhipSilk.java @@ -36,7 +36,7 @@ public final class WhipSilk extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has reach. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ReachAbility.getInstance(), AttachmentType.AURA))); diff --git a/Mage.Sets/src/mage/cards/w/WhiteScarab.java b/Mage.Sets/src/mage/cards/w/WhiteScarab.java index 1a2a51dce39..6307194c1aa 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteScarab.java +++ b/Mage.Sets/src/mage/cards/w/WhiteScarab.java @@ -49,7 +49,7 @@ public final class WhiteScarab extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature can't be blocked by white creatures. diff --git a/Mage.Sets/src/mage/cards/w/WhiteWard.java b/Mage.Sets/src/mage/cards/w/WhiteWard.java index b5bbdbddb47..323b2d83317 100644 --- a/Mage.Sets/src/mage/cards/w/WhiteWard.java +++ b/Mage.Sets/src/mage/cards/w/WhiteWard.java @@ -30,7 +30,7 @@ public final class WhiteWard extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Protect)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature has protection from white. This effect doesn't remove White Ward. this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/w/WildGrowth.java b/Mage.Sets/src/mage/cards/w/WildGrowth.java index 8ced21c954c..aa54b9df2e7 100644 --- a/Mage.Sets/src/mage/cards/w/WildGrowth.java +++ b/Mage.Sets/src/mage/cards/w/WildGrowth.java @@ -30,7 +30,7 @@ public final class WildGrowth extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land is tapped for mana, its controller adds {G}. diff --git a/Mage.Sets/src/mage/cards/w/WindZendikon.java b/Mage.Sets/src/mage/cards/w/WindZendikon.java index 697cc9a7ecc..af39a9fbe55 100644 --- a/Mage.Sets/src/mage/cards/w/WindZendikon.java +++ b/Mage.Sets/src/mage/cards/w/WindZendikon.java @@ -36,7 +36,7 @@ public final class WindZendikon extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutCreatureInPlay)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect( diff --git a/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java b/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java index 06baff72a93..88f438932ea 100644 --- a/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java +++ b/Mage.Sets/src/mage/cards/w/WingsOfAesthir.java @@ -37,7 +37,7 @@ public final class WingsOfAesthir extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+0 and has flying and first strike. Effect effect = new BoostEnchantedEffect(1, 0, Duration.WhileOnBattlefield); diff --git a/Mage.Sets/src/mage/cards/w/WingsOfHope.java b/Mage.Sets/src/mage/cards/w/WingsOfHope.java index 586f756a8a9..e699d2d5cd6 100644 --- a/Mage.Sets/src/mage/cards/w/WingsOfHope.java +++ b/Mage.Sets/src/mage/cards/w/WingsOfHope.java @@ -35,7 +35,7 @@ public final class WingsOfHope extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +1/+3 and has flying. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 3, Duration.WhileOnBattlefield)); diff --git a/Mage.Sets/src/mage/cards/w/WintersRest.java b/Mage.Sets/src/mage/cards/w/WintersRest.java index b26c180c8d5..e396e222d5e 100644 --- a/Mage.Sets/src/mage/cards/w/WintersRest.java +++ b/Mage.Sets/src/mage/cards/w/WintersRest.java @@ -38,7 +38,7 @@ public final class WintersRest extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Winter's Rest enters the battlefield, tap enchanted creature. @@ -91,4 +91,4 @@ class WintersRestEffect extends DontUntapInControllersUntapStepEnchantedEffect { } return super.applies(event, source, game); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/Withercrown.java b/Mage.Sets/src/mage/cards/w/Withercrown.java index acc11f560dc..1b4b4815311 100644 --- a/Mage.Sets/src/mage/cards/w/Withercrown.java +++ b/Mage.Sets/src/mage/cards/w/Withercrown.java @@ -40,7 +40,7 @@ public final class Withercrown extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has base power 0 and has “At the beginning of your upkeep, you lose 1 life unless you sacrifice this creature." diff --git a/Mage.Sets/src/mage/cards/w/WitheringHex.java b/Mage.Sets/src/mage/cards/w/WitheringHex.java index 3f751bc0a3e..d9b154e8cb5 100644 --- a/Mage.Sets/src/mage/cards/w/WitheringHex.java +++ b/Mage.Sets/src/mage/cards/w/WitheringHex.java @@ -38,7 +38,7 @@ public final class WitheringHex extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever a player cycles a card, put a plague counter on Withering Hex. diff --git a/Mage.Sets/src/mage/cards/w/WitnessProtection.java b/Mage.Sets/src/mage/cards/w/WitnessProtection.java index 12e200c99df..b47714d9c83 100644 --- a/Mage.Sets/src/mage/cards/w/WitnessProtection.java +++ b/Mage.Sets/src/mage/cards/w/WitnessProtection.java @@ -30,7 +30,7 @@ public final class WitnessProtection extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature loses all abilities and is a green and white Citizen creature with base power and toughness 1/1 named Legitimate Businessperson. this.addAbility(new SimpleStaticAbility(new WitnessProtectionEffect())); diff --git a/Mage.Sets/src/mage/cards/w/WolfkinBond.java b/Mage.Sets/src/mage/cards/w/WolfkinBond.java index a81aeeca3f7..088be9393e5 100644 --- a/Mage.Sets/src/mage/cards/w/WolfkinBond.java +++ b/Mage.Sets/src/mage/cards/w/WolfkinBond.java @@ -34,7 +34,7 @@ public final class WolfkinBond extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // When Wolfkin Bond enters the battlefield, create a 2/2 green Wolf creature token. diff --git a/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java b/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java index e38787096a4..532db353ad8 100644 --- a/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java +++ b/Mage.Sets/src/mage/cards/w/WolfwillowHaven.java @@ -35,7 +35,7 @@ public final class WolfwillowHaven extends CardImpl { TargetPermanent auraTarget = new TargetLandPermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted land is tapped for mana, its controller adds an additional {G}. diff --git a/Mage.Sets/src/mage/cards/w/Wordmail.java b/Mage.Sets/src/mage/cards/w/Wordmail.java index 95a781f753b..0b95c8f2437 100644 --- a/Mage.Sets/src/mage/cards/w/Wordmail.java +++ b/Mage.Sets/src/mage/cards/w/Wordmail.java @@ -36,7 +36,7 @@ public final class Wordmail extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // Enchanted creature gets +1/+1 for each word in its name. WordmailCount count = new WordmailCount(); diff --git a/Mage.Sets/src/mage/cards/w/WorldWeary.java b/Mage.Sets/src/mage/cards/w/WorldWeary.java index 06e29ec0eda..c6afcfa6b7e 100644 --- a/Mage.Sets/src/mage/cards/w/WorldWeary.java +++ b/Mage.Sets/src/mage/cards/w/WorldWeary.java @@ -31,7 +31,7 @@ public final class WorldWeary extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets -4/-4. diff --git a/Mage.Sets/src/mage/cards/w/WreathOfGeists.java b/Mage.Sets/src/mage/cards/w/WreathOfGeists.java index a5099368feb..2c50cf1dd8f 100644 --- a/Mage.Sets/src/mage/cards/w/WreathOfGeists.java +++ b/Mage.Sets/src/mage/cards/w/WreathOfGeists.java @@ -33,7 +33,7 @@ public final class WreathOfGeists extends CardImpl { this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +X/+X, where X is the number of creature cards in your graveyard. diff --git a/Mage.Sets/src/mage/cards/w/WritOfPassage.java b/Mage.Sets/src/mage/cards/w/WritOfPassage.java index b991d13f65a..dec34daa7ec 100644 --- a/Mage.Sets/src/mage/cards/w/WritOfPassage.java +++ b/Mage.Sets/src/mage/cards/w/WritOfPassage.java @@ -37,7 +37,7 @@ public final class WritOfPassage extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Whenever enchanted creature attacks, if its power is 2 or less, it's unblockable this turn. diff --git a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java index 44237d1424a..b3234732ed5 100644 --- a/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java +++ b/Mage.Sets/src/mage/cards/w/WurmweaverCoil.java @@ -44,7 +44,7 @@ public final class WurmweaverCoil extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(filter); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(6, 6, Duration.WhileOnBattlefield))); Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WurmToken(), 1), new ManaCostsImpl<>("{G}{G}{G}")); diff --git a/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java b/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java index 84cc0d3f912..09a0a36ff7c 100644 --- a/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java +++ b/Mage.Sets/src/mage/cards/y/YavimayasEmbrace.java @@ -37,7 +37,7 @@ public final class YavimayasEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // You control enchanted creature. this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect())); diff --git a/Mage.Sets/src/mage/cards/y/YokeOfTheDamned.java b/Mage.Sets/src/mage/cards/y/YokeOfTheDamned.java index a6ebe276eca..ca7555d725e 100644 --- a/Mage.Sets/src/mage/cards/y/YokeOfTheDamned.java +++ b/Mage.Sets/src/mage/cards/y/YokeOfTheDamned.java @@ -28,7 +28,7 @@ public final class YokeOfTheDamned extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment)); - this.addAbility(new EnchantAbility(auraTarget.getTargetName())); + this.addAbility(new EnchantAbility(auraTarget)); // When a creature dies, destroy enchanted creature. this.addAbility(new DiesCreatureTriggeredAbility( diff --git a/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java b/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java index a2c94076e87..17db1231ddf 100644 --- a/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java +++ b/Mage.Sets/src/mage/cards/z/ZephidsEmbrace.java @@ -32,7 +32,7 @@ public final class ZephidsEmbrace extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature gets +2/+2 and has flying and shroud. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2)); diff --git a/Mage.Sets/src/mage/cards/z/ZephyrNet.java b/Mage.Sets/src/mage/cards/z/ZephyrNet.java index 9d1cc141571..2416a4023f0 100644 --- a/Mage.Sets/src/mage/cards/z/ZephyrNet.java +++ b/Mage.Sets/src/mage/cards/z/ZephyrNet.java @@ -31,7 +31,7 @@ public final class ZephyrNet extends CardImpl { TargetPermanent auraTarget = new TargetCreaturePermanent(); this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature)); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); this.addAbility(ability); // Enchanted creature has defender and flying. diff --git a/Mage/src/main/java/mage/abilities/common/AnimateDeadTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AnimateDeadTriggeredAbility.java index f65bddab259..228f5690d58 100644 --- a/Mage/src/main/java/mage/abilities/common/AnimateDeadTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/AnimateDeadTriggeredAbility.java @@ -100,7 +100,7 @@ class AnimateDeadReplaceAbilityEffect extends ContinuousEffectImpl implements So FilterCreaturePermanent filter = new FilterCreaturePermanent("creature put onto the battlefield with {this}"); filter.add(new AnimateDeadPredicate(source.getSourceId())); newTarget = new TargetCreaturePermanent(filter); - newAbility = new EnchantAbility(newTarget.getTargetName()); + newAbility = new EnchantAbility(newTarget); } @Override diff --git a/Mage/src/main/java/mage/abilities/common/LicidAbility.java b/Mage/src/main/java/mage/abilities/common/LicidAbility.java index 18462b1ce55..d3bbb4940a1 100644 --- a/Mage/src/main/java/mage/abilities/common/LicidAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LicidAbility.java @@ -124,12 +124,11 @@ class LicidContinuousEffect extends ContinuousEffectImpl { } licid.removeAbilities(toRemove, source.getSourceId(), game); - Ability ability = new EnchantAbility("creature"); + Target target = new TargetCreaturePermanent(); + Ability ability = new EnchantAbility(target); ability.setRuleAtTheTop(true); licid.addAbility(ability, source.getSourceId(), game); licid.getSpellAbility().getTargets().clear(); - Target target = new TargetCreaturePermanent(); - target.addTarget(this.getTargetPointer().getFirst(game, source), source, game); licid.getSpellAbility().getTargets().add(target); } return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java index 49b8bd9021d..bd6d91ae677 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesAuraSourceEffect.java @@ -21,7 +21,7 @@ public class BecomesAuraSourceEffect extends ContinuousEffectImpl implements Sou public BecomesAuraSourceEffect(Target target) { super(Duration.Custom, Outcome.AddAbility); this.target = target; - newAbility = new EnchantAbility(target.getTargetName()); + newAbility = new EnchantAbility(target); newAbility.setRuleAtTheTop(true); staticText = "it becomes an Aura with enchant " + target.getTargetName(); dependencyTypes.add(DependencyType.AuraAddingRemoving); diff --git a/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java b/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java index 4c3bbec3e27..6dbdb501b4c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/EnchantAbility.java @@ -3,6 +3,7 @@ package mage.abilities.keyword; import mage.constants.Zone; import mage.abilities.StaticAbility; +import mage.target.Target; /** * @@ -13,9 +14,9 @@ public class EnchantAbility extends StaticAbility { protected String targetName; - public EnchantAbility(String targetName) { + public EnchantAbility(Target target) { super(Zone.BATTLEFIELD, null); - this.targetName = targetName; + this.targetName = target.getTargetName(); } public EnchantAbility(final EnchantAbility ability) { diff --git a/Mage/src/main/java/mage/game/permanent/token/MaskToken.java b/Mage/src/main/java/mage/game/permanent/token/MaskToken.java index fd1619f9955..dffc11be5c5 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MaskToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MaskToken.java @@ -25,7 +25,7 @@ public final class MaskToken extends TokenImpl { subtype.add(SubType.AURA); TargetPermanent auraTarget = new TargetPermanent(); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); ability.addTarget(auraTarget); ability.addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/game/permanent/token/SmokeBlessingToken.java b/Mage/src/main/java/mage/game/permanent/token/SmokeBlessingToken.java index 147e3600544..c65012de674 100644 --- a/Mage/src/main/java/mage/game/permanent/token/SmokeBlessingToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/SmokeBlessingToken.java @@ -31,7 +31,7 @@ public final class SmokeBlessingToken extends TokenImpl { subtype.add(SubType.AURA); TargetPermanent auraTarget = new TargetPermanent(); - Ability ability = new EnchantAbility(auraTarget.getTargetName()); + Ability ability = new EnchantAbility(auraTarget); ability.addTarget(auraTarget); ability.addEffect(new AttachEffect(Outcome.BoostCreature)); this.addAbility(ability); diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl index b1c26eaf3e0..c20495175b2 100755 --- a/Utils/gen-card.pl +++ b/Utils/gen-card.pl @@ -282,7 +282,7 @@ foreach my $ability (@abilities) { } $vars{'abilities'} .= "\n this.getSpellAbility().addTarget(auraTarget);"; $vars{'abilities'} .= "\n this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));"; - $vars{'abilities'} .= "\n this.addAbility(new EnchantAbility(auraTarget.getTargetName()));"; + $vars{'abilities'} .= "\n this.addAbility(new EnchantAbility(auraTarget));"; $vars{'abilitiesImports'} .= "\nimport mage.abilities.effects.common.AttachEffect;"; $vars{'abilitiesImports'} .= "\nimport mage.constants.Outcome;"; $vars{'abilitiesImports'} .= "\nimport mage.target.TargetPermanent;";