merge

Mage.Sets/src/mage/sets/dissension/BloodCrypt.java

@@ -53,7 +53,7 @@ public class BloodCrypt extends CardImpl<BloodCrypt> {
         this.subtype.add("Mountain");
         this.addAbility(new BlackManaAbility());
         this.addAbility(new RedManaAbility());
-        this.addAbility(new EntersBattlefieldAbility(new TapSourceUnlessPaysEffect(new PayLifeCost(2)), "As Blood Crypt enters the battlefield, you may pay 2 life. If you don't, Blood Crypt enters the battlefield tapped"));
+        this.addAbility(new EntersBattlefieldAbility(new TapSourceUnlessPaysEffect(new PayLifeCost(2)), "As {this} enters the battlefield, you may pay 2 life. If you don't, {this} enters the battlefield tapped"));
     }
 
     public BloodCrypt (final BloodCrypt card) {

Mage.Sets/src/mage/sets/lorwyn/AjaniGoldmane.java

@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/AvianChangeling.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.keyword.ChangelingAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/AxegrinderGiant.java

@@ -27,12 +27,13 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/BattleMastery.java

@@ -27,15 +27,12 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
-import mage.abilities.effects.common.continious.BoostEnchantedEffect;
 import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
 import mage.abilities.keyword.DoubleStrikeAbility;
 import mage.abilities.keyword.EnchantAbility;
@@ -43,6 +40,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/Benthicore.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -47,6 +45,8 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.MerfolkToken;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.filter.Filter;
 import mage.filter.FilterPermanent;
 import mage.target.TargetPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/BoggartBirthRite.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.ReturnToHandTargetEffect;
@@ -36,6 +35,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInYourGraveyard;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/ChandraNalaar.java

@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/CloudcrownOak.java

@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.keyword.ReachAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -47,6 +45,8 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.KithkinToken;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/DeeptreadMerrow.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
 import mage.abilities.keyword.IslandwalkAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/ElvishEulogist.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -41,6 +39,8 @@ import mage.cards.CardImpl;
 import mage.filter.Filter;
 import mage.filter.FilterCard;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/ElvishHandservant.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -38,6 +37,8 @@ import mage.counters.CounterType;
 import mage.filter.Filter;
 import mage.filter.FilterCard;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/ElvishPromenade.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
@@ -37,6 +36,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.ElfToken;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/EpicProportions.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -44,6 +42,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DestroyTargetEffect;
@@ -36,6 +35,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/Facevaulter.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,6 +41,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterControlledPermanent;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/FamiliarsRuse.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.costs.common.ReturnToHandTargetCost;
@@ -36,6 +35,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetSpell;
 import mage.target.common.TargetControlledCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/FinalRevels.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -37,6 +35,8 @@ import mage.abilities.effects.common.continious.BoostAllEffect;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/FlamekinBrawler.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -38,6 +36,8 @@ import mage.abilities.costs.mana.ColoredManaCost;
 import mage.abilities.effects.common.continious.BoostSourceEffect;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/FlamekinSpitfire.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/GarrukWildspeaker.java

@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/GhostlyChangeling.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.continious.BoostSourceEffect;
 import mage.abilities.keyword.ChangelingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/GiltLeafSeer.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
@@ -47,6 +46,8 @@ import mage.game.Game;
 import mage.players.Player;
 import mage.target.TargetCard;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,7 +41,8 @@ import mage.cards.CardImpl;
 import mage.filter.Filter;
 import mage.filter.FilterPermanent;
 import mage.target.TargetPermanent;
-import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
 
 /**
  *

Mage.Sets/src/mage/sets/lorwyn/GuardianOfCloverdell.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -46,6 +44,8 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.KithkinToken;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/HarpoonSniper.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -44,6 +42,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterControlledPermanent;
 import mage.target.common.TargetAttackingOrBlockingCreature;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/HearthcageGiant.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -47,6 +45,8 @@ import mage.game.permanent.token.Token;
 import mage.target.common.TargetControlledPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/HerbalPoultice.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.effects.common.RegenerateTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/HillcomberGiant.java

@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.keyword.MountainwalkAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/HoofprintsOfTheStag.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -45,6 +43,8 @@ import mage.cards.CardImpl;
 import mage.counters.CounterType;
 import mage.game.permanent.token.Token;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/HornetHarasser.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/HurlyBurly.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Mode;
@@ -36,6 +35,8 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/ImmaculateMagistrate.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Outcome;
 import mage.Constants.Rarity;
@@ -44,6 +43,8 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/ImperiousPerfect.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -45,6 +43,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.game.permanent.token.ElfToken;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/JaceBeleren.java

@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/KinsbaileBalloonist.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/KinsbaileSkirmisher.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/KithkinDaggerdare.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -41,6 +39,8 @@ import mage.abilities.effects.common.continious.BoostTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetAttackingCreature;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/KithkinHealer.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.effects.common.PreventDamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/KnightOfMeadowgrain.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.keyword.FirstStrikeAbility;
 import mage.abilities.keyword.LifelinkAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/LaceWithMoonglove.java

@@ -27,18 +27,17 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DrawCardControllerEffect;
-import mage.abilities.effects.common.DrawCardEffect;
 import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.keyword.DeathtouchAbility;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/LeafGilder.java

@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.mana.GreenManaAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/LilianaVess.java

@@ -27,9 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.Rarity;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/LysAlanaHuntmaster.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -38,6 +37,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.game.permanent.token.ElfToken;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/MadAuntie.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,9 +41,10 @@ import mage.cards.CardImpl;
 import mage.filter.Filter;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.target.Target;
 import mage.target.common.TargetControlledCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/MoongloveWinnower.java

@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.keyword.DeathtouchAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/MudbuttonTorchrunner.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -37,6 +36,8 @@ import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/NeckSnap.java

@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetAttackingOrBlockingCreature;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -45,6 +43,8 @@ import mage.filter.Filter;
 import mage.filter.FilterPermanent;
 import mage.target.TargetPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.common.CantBlockAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/OakgnarlWarrior.java

@@ -27,14 +27,15 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.keyword.VigilanceAbility;
 import mage.abilities.keyword.TrampleAbility;
+import mage.abilities.keyword.VigilanceAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/PloverKnights.java

@@ -27,14 +27,15 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.FirstStrikeAbility;
+import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/ProtectiveBubble.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,6 +41,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/ScarredVinebreeder.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Duration;
 import mage.Constants.Rarity;
@@ -41,6 +40,8 @@ import mage.cards.CardImpl;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInYourGraveyard;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/ScionOfOona.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -41,10 +39,11 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.abilities.keyword.ShroudAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter;
-import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/SeedguideAsh.java

@@ -27,13 +27,10 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
-import mage.abilities.Ability;
 import mage.abilities.common.DiesTriggeredAbility;
 import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect;
 import mage.cards.CardImpl;
@@ -41,6 +38,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInLibrary;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/SentinelsOfGlenElendra.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.keyword.FlashAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/ShimmeringGrotto.java

@@ -27,17 +27,17 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
 import mage.abilities.costs.common.TapSourceCost;
-import mage.abilities.costs.mana.ColoredManaCost;
 import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.ColorlessManaAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/SkeletalChangeling.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,6 +37,8 @@ import mage.abilities.effects.common.RegenerateSourceEffect;
 import mage.abilities.keyword.ChangelingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/SowerOfTemptation.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/SpiderwigBoggart.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -40,6 +38,8 @@ import mage.abilities.keyword.FearAbility;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/SpringleafDrum.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
@@ -38,6 +36,8 @@ import mage.cards.CardImpl;
 import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  * @author Loki
  */

Mage.Sets/src/mage/sets/lorwyn/SummonTheSchool.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.filter.common.FilterControlledPermanent;
 import mage.game.permanent.token.MerfolkToken;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/SunriseSovereign.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,9 +37,10 @@ import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
 import mage.abilities.keyword.TrampleAbility;
 import mage.cards.CardImpl;
 import mage.filter.Filter;
-import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/TarPitcher.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -44,6 +42,8 @@ import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.target.common.TargetControlledCreaturePermanent;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/Tarfire.java

@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.cards.CardImpl;
 import mage.target.common.TargetCreatureOrPlayer;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/ThorntoothWitch.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -41,6 +39,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/TimberProtector.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.filter.Filter;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author anonymous

Mage.Sets/src/mage/sets/lorwyn/VividCrag.java

@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.RedManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
@@ -50,8 +53,9 @@ public class VividCrag extends CardImpl<VividCrag> {
         super(ownerId, 275, "Vivid Crag", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Crag enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {R} to your mana pool.
         this.addAbility(new RedManaAbility());
         // {tap}, Remove a charge counter from Vivid Crag: Add one mana of any color to your mana pool.

Mage.Sets/src/mage/sets/lorwyn/VividCreek.java

@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.BlueManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
@@ -50,8 +53,9 @@ public class VividCreek extends CardImpl<VividCreek> {
         super(ownerId, 276, "Vivid Creek", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Creek enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {U} to your mana pool.
         this.addAbility(new BlueManaAbility());
         // {tap}, Remove a charge counter from Vivid Creek: Add one mana of any color to your mana pool.

Mage.Sets/src/mage/sets/lorwyn/VividGrove.java

@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.GreenManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
@@ -50,8 +53,9 @@ public class VividGrove extends CardImpl<VividGrove> {
         super(ownerId, 277, "Vivid Grove", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Grove enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {G} to your mana pool.
         this.addAbility(new GreenManaAbility());
         // {tap}, Remove a charge counter from Vivid Grove: Add one mana of any color to your mana pool.

Mage.Sets/src/mage/sets/lorwyn/VividMarsh.java

@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.BlueManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author anonymous
@@ -50,8 +53,9 @@ public class VividMarsh extends CardImpl<VividMarsh> {
         super(ownerId, 278, "Vivid Marsh", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Marsh enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {B} to your mana pool.
         this.addAbility(new BlueManaAbility());
         // {tap}, Remove a charge counter from Vivid Marsh: Add one mana of any color to your mana pool.

Mage.Sets/src/mage/sets/lorwyn/VividMeadow.java

@@ -27,19 +27,22 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
+import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.Ability;
-import mage.abilities.common.EntersBattlefieldAbility;
+import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.costs.common.RemoveCountersSourceCost;
+import mage.abilities.effects.EntersBattlefieldEffect;
+import mage.abilities.effects.common.TapSourceEffect;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.abilities.mana.AnyColorManaAbility;
 import mage.abilities.mana.WhiteManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki
@@ -50,8 +53,9 @@ public class VividMeadow extends CardImpl<VividMeadow> {
         super(ownerId, 279, "Vivid Meadow", Rarity.UNCOMMON, new CardType[]{CardType.LAND}, "");
         this.expansionSetCode = "LRW";
         // Vivid Meadow enters the battlefield tapped with two charge counters on it.
-        this.addAbility(new EntersBattlefieldTappedAbility());
+        EntersBattlefieldEffect effect = new EntersBattlefieldEffect(new TapSourceEffect(true), "tapped with two charge counters on it");
-        this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2))));
+        effect.addEffect(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
+        this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, effect));
         // {tap}: Add {W} to your mana pool.
         this.addAbility(new WhiteManaAbility());
         // {tap}, Remove a charge counter from Vivid Meadow: Add one mana of any color to your mana pool.

Mage.Sets/src/mage/sets/lorwyn/WanderersTwig.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -39,9 +37,10 @@ import mage.abilities.costs.mana.GenericManaCost;
 import mage.abilities.effects.common.search.SearchLibraryRevealPutInHandEffect;
 import mage.cards.CardImpl;
 import mage.filter.common.FilterBasicLandCard;
-import mage.target.common.TargetBasicLandCard;
 import mage.target.common.TargetCardInLibrary;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/WarrenScourgeElf.java

@@ -27,7 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
@@ -35,6 +34,8 @@ import mage.abilities.keyword.ProtectionAbility;
 import mage.cards.CardImpl;
 import mage.filter.FilterCard;
 
+import java.util.UUID;
+
 /**
  *
  * @author North

Mage.Sets/src/mage/sets/lorwyn/WizenedCenn.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -37,9 +35,10 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.continious.BoostControlledEffect;
 import mage.cards.CardImpl;
 import mage.filter.Filter;
-import mage.filter.common.FilterControlledCreaturePermanent;
 import mage.filter.common.FilterCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/WoodlandChangeling.java

@@ -27,13 +27,14 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.keyword.ChangelingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/WortBoggartAuntie.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.filter.Filter;
 import mage.filter.FilterCard;
 import mage.target.common.TargetCardInYourGraveyard;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/WydwenTheBitingGale.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -42,6 +40,8 @@ import mage.abilities.keyword.FlashAbility;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage.Sets/src/mage/sets/lorwyn/ZephyrNet.java

@@ -27,8 +27,6 @@
  */
 package mage.sets.lorwyn;
 
-import java.util.UUID;
-
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -43,6 +41,8 @@ import mage.cards.CardImpl;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author Loki

Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java

@@ -40,7 +40,7 @@ import mage.abilities.effects.common.TapSourceEffect;
 public class EntersBattlefieldTappedAbility extends StaticAbility<EntersBattlefieldTappedAbility> {
 
 	public EntersBattlefieldTappedAbility() {
-		super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new TapSourceEffect()));
+		super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new TapSourceEffect(true)));
 	}
 
 	public EntersBattlefieldTappedAbility(final EntersBattlefieldTappedAbility ability) {

Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java

@@ -98,7 +98,7 @@ public class EntersBattlefieldEffect extends ReplacementEffectImpl<EntersBattlef
 		if (text.length() == 0)
 			return "When {this} enters the battlefield, " + baseEffects.getText(mode);
 		else
-			return text;
+			return "When {this} enters the battlefield, " + text;
 	}
 
 	@Override

Mage/src/mage/abilities/effects/common/TapSourceEffect.java

@@ -39,14 +39,21 @@ import mage.game.permanent.Permanent;
  * @author BetaSteward_at_googlemail.com
  */
 public class TapSourceEffect extends OneShotEffect<TapSourceEffect> {
+    private boolean withoutTrigger;
 
     public TapSourceEffect() {
+        this(false);
+    }
+
+	public TapSourceEffect(boolean withoutTrigger) {
 		super(Outcome.Tap);
+        this.withoutTrigger = withoutTrigger;
 		staticText = "tap {this}";
 	}
 
 	public TapSourceEffect(final TapSourceEffect effect) {
 		super(effect);
+        this.withoutTrigger = effect.withoutTrigger;
 	}
 
 	@Override
@@ -58,7 +65,11 @@ public class TapSourceEffect extends OneShotEffect<TapSourceEffect> {
 	public boolean apply(Game game, Ability source) {
 		Permanent permanent = game.getPermanent(source.getSourceId());
 		if (permanent != null) {
+            if (withoutTrigger) {
+                permanent.setTapped(true);
+            } else {
 			    permanent.tap(game);
+            }
 			return true;
 		}
 		return false;