From 4577bfda9ccaa255509dfac972d1be03683e6a1f Mon Sep 17 00:00:00 2001 From: Loki Date: Sat, 7 Jul 2012 18:17:46 +1200 Subject: [PATCH] fix --- Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java | 4 ++-- .../src/mage/sets/urzassaga/BrilliantHalo.java | 4 ++-- ...tIntoGraveFromBattlefieldTriggeredAbility.java} | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) rename Mage/src/mage/abilities/common/{PutIntoGraveFromBattlefield.java => PutIntoGraveFromBattlefieldTriggeredAbility.java} (67%) diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java index b8db415293a..d933064eaa5 100644 --- a/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java +++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java @@ -31,7 +31,7 @@ import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefield; +import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; @@ -69,7 +69,7 @@ public class Rancor extends CardImpl { this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), Constants.AttachmentType.AURA))); // When Rancor is put into a graveyard from the battlefield, return Rancor to its owner's hand. - this.addAbility(new PutIntoGraveFromBattlefield(new ReturnToHandSourceEffect())); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); } public Rancor(final Rancor card) { diff --git a/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java b/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java index d3d2a575244..1e82fe98ff6 100644 --- a/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java +++ b/Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java @@ -33,7 +33,7 @@ import mage.Constants; import mage.Constants.CardType; import mage.Constants.Rarity; import mage.abilities.Ability; -import mage.abilities.common.PutIntoGraveFromBattlefield; +import mage.abilities.common.PutIntoGraveFromBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.ReturnToHandSourceEffect; @@ -65,7 +65,7 @@ public class BrilliantHalo extends CardImpl { // Enchanted creature gets +1/+2. this.addAbility(new SimpleStaticAbility(Constants.Zone.BATTLEFIELD, new BoostEnchantedEffect(1, 2, Constants.Duration.WhileOnBattlefield))); // When Brilliant Halo is put into a graveyard from the battlefield, return Brilliant Halo to its owner's hand. - this.addAbility(new PutIntoGraveFromBattlefield(new ReturnToHandSourceEffect())); + this.addAbility(new PutIntoGraveFromBattlefieldTriggeredAbility(new ReturnToHandSourceEffect())); } public BrilliantHalo(final BrilliantHalo card) { diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefield.java b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java similarity index 67% rename from Mage/src/mage/abilities/common/PutIntoGraveFromBattlefield.java rename to Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java index d8b3478dac0..4151ffb99a8 100644 --- a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefield.java +++ b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java @@ -11,23 +11,23 @@ import mage.game.permanent.Permanent; /** * @author nantuko, loki */ -public class PutIntoGraveFromBattlefield extends TriggeredAbilityImpl { +public class PutIntoGraveFromBattlefieldTriggeredAbility extends TriggeredAbilityImpl { - public PutIntoGraveFromBattlefield(Effect effect) { + public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect) { this(effect, false); } - public PutIntoGraveFromBattlefield(Effect effect, boolean optional) { + public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect, boolean optional) { super(Constants.Zone.ALL, effect, optional); } - PutIntoGraveFromBattlefield(PutIntoGraveFromBattlefield ability) { + PutIntoGraveFromBattlefieldTriggeredAbility(PutIntoGraveFromBattlefieldTriggeredAbility ability) { super(ability); } @Override - public PutIntoGraveFromBattlefield copy() { - return new PutIntoGraveFromBattlefield(this); + public PutIntoGraveFromBattlefieldTriggeredAbility copy() { + return new PutIntoGraveFromBattlefieldTriggeredAbility(this); } @Override @@ -49,6 +49,6 @@ public class PutIntoGraveFromBattlefield extends TriggeredAbilityImpl