* Chain of Vapor - Fixed that the copied spell did nor work correctly.

This commit is contained in:
LevelX2 2015-09-03 01:28:26 +02:00
parent 1ee22be81a
commit 7627935d93
5 changed files with 90 additions and 26 deletions

View file

@ -365,7 +365,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
game.getState().getCommand().remove((Commander) game.getObject(objectId));
break;
case STACK:
StackObject stackObject = game.getStack().getSpell(getId());
StackObject stackObject = game.getStack().getSpell(getSpellAbility().getId());
if (stackObject == null && (this instanceof SplitCard)) { // handle if half of Split cast is on the stack
stackObject = game.getStack().getSpell(((SplitCard) this).getLeftHalfCard().getId());
if (stackObject == null) {

View file

@ -197,9 +197,11 @@ public class Spell extends StackObjImpl implements Card {
}
}
if (game.getState().getZone(card.getMainCard().getId()) == Zone.STACK) {
Player player = game.getPlayer(getControllerId());
if (player != null) {
player.moveCards(card, Zone.STACK, Zone.GRAVEYARD, ability, game);
if (isCopy() == card.isCopy()) {
Player player = game.getPlayer(getControllerId());
if (player != null) {
player.moveCards(card, Zone.STACK, Zone.GRAVEYARD, ability, game);
}
}
}
return result;