diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java index 821c8a03b0c..1e464015625 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheCedars.java @@ -79,7 +79,7 @@ public class GenjuOfTheCedars extends CardImpl { this.addAbility(ability2); // When enchanted Forest is put into a graveyard, you may return Genju of the Cedars from your graveyard to your hand. - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Forest", true); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Forest", true, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java index e461340c1ed..3c7b404d25a 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFalls.java @@ -80,7 +80,7 @@ public class GenjuOfTheFalls extends CardImpl { this.addAbility(ability2); // When enchanted Island is put into a graveyard, you may return Genju of the Falls from your graveyard to your hand. TargetPermanent auraTarget = new TargetLandPermanent(filter); - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Island", true); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Island", true, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java index 505af0093ff..638ccbcac75 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFens.java @@ -84,7 +84,7 @@ public class GenjuOfTheFens extends CardImpl { this.addAbility(ability2); // When enchanted Swamp is put into a graveyard, you may return Genju of the Fens from your graveyard to your hand. - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Swamp", true); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Swamp", true, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java index 4f13f3f2007..884dec6997e 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheFields.java @@ -82,7 +82,7 @@ public class GenjuOfTheFields extends CardImpl { this.addAbility(ability2); // When enchanted Plains is put into a graveyard, you may return Genju of the Fields from your graveyard to your hand. - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Plains", true); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Plains", true, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java index 464342d21bf..5ad1e495953 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheRealm.java @@ -80,7 +80,7 @@ public class GenjuOfTheRealm extends CardImpl { this.addAbility(ability2); // When enchanted land is put into a graveyard, you may return Genju of the Realm from your graveyard to your hand. - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted land", true); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted land", true, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java index fe46718b7f8..ee3df666939 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GenjuOfTheSpires.java @@ -79,7 +79,7 @@ public class GenjuOfTheSpires extends CardImpl { this.addAbility(ability2); // When enchanted Mountain is put into a graveyard, you may return Genju of the Spires from your graveyard to your hand. - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Mountain", true); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandSourceEffect(), "enchanted Mountain", true, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GodsEyeGateToTheReikai.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GodsEyeGateToTheReikai.java index 59a06039e22..af159c7749d 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/GodsEyeGateToTheReikai.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/GodsEyeGateToTheReikai.java @@ -31,6 +31,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.mana.ColorlessManaAbility; import mage.cards.CardImpl; @@ -49,7 +50,7 @@ public class GodsEyeGateToTheReikai extends CardImpl { // {tap}: Add {1} to your mana pool. this.addAbility(new ColorlessManaAbility()); // When Gods' Eye, Gate to the Reikai is put into a graveyard from the battlefield, put a 1/1 colorless Spirit creature token onto the battlefield. - this.addAbility(new DiesTriggeredAbility(new CreateTokenEffect(new SpiritToken(), 1), false)); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new CreateTokenEffect(new SpiritToken(), 1), false)); } public GodsEyeGateToTheReikai(final GodsEyeGateToTheReikai card) { diff --git a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java index 0622c951ecb..288a9fc5806 100644 --- a/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java +++ b/Mage.Sets/src/mage/sets/guildpact/HatchingPlans.java @@ -32,6 +32,7 @@ import java.util.UUID; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.effects.common.DrawCardControllerEffect; import mage.cards.CardImpl; @@ -45,7 +46,7 @@ public class HatchingPlans extends CardImpl { super(ownerId, 27, "Hatching Plans", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{U}"); this.expansionSetCode = "GPT"; this.color.setBlue(true); - this.addAbility(new DiesTriggeredAbility(new DrawCardControllerEffect(3))); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new DrawCardControllerEffect(3))); } public HatchingPlans (final HatchingPlans card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java index 01860ac995e..21b659946c4 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/GlisteningOil.java @@ -35,6 +35,7 @@ import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.AttachEffect; @@ -67,7 +68,7 @@ public class GlisteningOil extends CardImpl { this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(InfectAbility.getInstance(), Constants.AttachmentType.AURA))); this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GlisteningOilEffect(), Constants.TargetController.YOU, false)); - this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); } public GlisteningOil(final GlisteningOil card) { diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java b/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java index 12c2db2bdc8..adff24c7df8 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/ViridianHarvest.java @@ -60,7 +60,7 @@ public class ViridianHarvest extends CardImpl { Ability ability = new EnchantAbility(auraTarget.getTargetName()); this.addAbility(ability); - this.addAbility(new DiesAttachedTriggeredAbility(new GainLifeEffect(6), "enchanted artifact")); + this.addAbility(new DiesAttachedTriggeredAbility(new GainLifeEffect(6), "enchanted artifact", false, false)); } public ViridianHarvest(final ViridianHarvest card) { diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java b/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java index 4f5bc00c027..17122a33562 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Cessation.java @@ -34,6 +34,7 @@ import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.Ability; import mage.abilities.common.DiesTriggeredAbility; +import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.RestrictionEffect; import mage.abilities.effects.common.AttachEffect; @@ -66,7 +67,7 @@ public class Cessation extends CardImpl { this.addAbility(ability); this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new CessationEffect())); //When Cessation is put into a graveyard from the battlefield, return Cessation to its owner's hand. - this.addAbility(new DiesTriggeredAbility(new ReturnToHandSourceEffect())); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); } public Cessation(final Cessation card) { diff --git a/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java b/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java index 6ef6f90b8bf..88b3b333d49 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/CorruptedZendikon.java @@ -70,7 +70,7 @@ public class CorruptedZendikon extends CardImpl { Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new OozeToken(), "Enchanted land is a 3/3 black Ooze creature. It's still a land.", Constants.Duration.Custom)); this.addAbility(ability2); - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land"); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java b/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java index 5b0986a2739..caf0b132829 100644 --- a/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/CrusherZendikon.java @@ -71,7 +71,7 @@ public class CrusherZendikon extends CardImpl { Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new BeastToken(), "Enchanted land is a 4/2 red Beast creature with trample. It's still a land.", Constants.Duration.Custom)); this.addAbility(ability2); - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land"); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java b/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java index a9f215b0e80..88f315f64ad 100644 --- a/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/GuardianZendikon.java @@ -71,7 +71,7 @@ public class GuardianZendikon extends CardImpl { Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new WallToken(), "Enchanted land is a 2/6 white wall creature with defender. It's still a land", Constants.Duration.Custom)); this.addAbility(ability2); - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land"); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java b/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java index 3b795954313..9824748e5ab 100644 --- a/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/VastwoodZendikon.java @@ -70,7 +70,7 @@ public class VastwoodZendikon extends CardImpl { Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new VastwoodElementalToken(), "Enchanted land is a 6/4 green Elemental creature. It's still a land", Constants.Duration.Custom)); this.addAbility(ability2); - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land"); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); this.addAbility(ability3); } diff --git a/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java b/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java index 0df1d3ec73d..a525a34a4e7 100644 --- a/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java +++ b/Mage.Sets/src/mage/sets/worldwake/WindZendikon.java @@ -71,7 +71,7 @@ public class WindZendikon extends CardImpl { Ability ability2 = new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BecomesCreatureAttachedEffect(new ElementalToken(), "Enchanted land is a 2/2 blue Elemental creature with flying. It's still a land", Constants.Duration.Custom)); this.addAbility(ability2); - Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land"); + Ability ability3 = new DiesAttachedTriggeredAbility(new ReturnToHandAttachedEffect(), "enchanted land", false, false); this.addAbility(ability3); }