Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* SetPowerToughnessSourceEffect - Set the correct sublayer to use (fixes #1354).

Browse source
This commit is contained in:
LevelX2 2015-11-04 22:31:35 +01:00
parent af18f95bba
commit 1139495fd7
24 changed files with 238 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/mage/game/stack/Spell.java
View file

@ -328,8 +328,13 @@ public class Spell extends StackObjImpl implements Card {
@Override
public void counter(UUID sourceId, Game game) {
this.counter(sourceId, game, true);
}
@Override
public void counter(UUID sourceId, Game game, boolean moveToGraveyard) {
this.countered = true;
if (!isCopiedSpell()) {
if (!isCopiedSpell() && moveToGraveyard) {
Player player = game.getPlayer(getControllerId());
if (player != null) {
Ability counteringAbility = null;
@ -337,7 +342,7 @@ public class Spell extends StackObjImpl implements Card {
if (counteringObject instanceof StackObject) {
counteringAbility = ((StackObject) counteringObject).getStackAbility();
}
player.moveCards(card, Zone.STACK, Zone.GRAVEYARD, counteringAbility, game);
player.moveCards(card, Zone.GRAVEYARD, counteringAbility, game);
}
}
}
@ -662,11 +667,7 @@ public class Spell extends StackObjImpl implements Card {
if (this.isCopiedSpell() && !zone.equals(Zone.STACK)) {
return true;
}
Card card = game.getCard(getSourceId());
if (card != null) {
return card.moveToZone(zone, sourceId, game, flag, appliedEffects);
}
throw new UnsupportedOperationException("Unsupported operation");
return card.moveToZone(zone, sourceId, game, flag, appliedEffects);
}
@Override