github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
Loki 2012-07-07 18:17:46 +12:00
parent 08e46fad24
commit 4577bfda9c
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/sets/urzaslegacy/Rancor.java
View file

@ -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<Rancor> {
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) {

4
Mage.Sets/src/mage/sets/urzassaga/BrilliantHalo.java
View file

@ -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<BrilliantHalo> {
// 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) {

14
Mage/src/mage/abilities/common/PutIntoGraveFromBattlefield.java → Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java
View file

@ -11,23 +11,23 @@ import mage.game.permanent.Permanent;
/**
* @author nantuko, loki
*/
public class PutIntoGraveFromBattlefield extends TriggeredAbilityImpl<PutIntoGraveFromBattlefield> {
public class PutIntoGraveFromBattlefieldTriggeredAbility extends TriggeredAbilityImpl<PutIntoGraveFromBattlefieldTriggeredAbility> {
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<PutIntoGra
@Override
public String getRule() {
return "When {this} is put into a graveyard from the battlefield, return {this} to its owner's hand";
return "When {this} is put into a graveyard from the battlefield, " + super.getRule();
}
}