mirror of
https://github.com/correl/mage.git
synced 2024-12-26 11:09:27 +00:00
* Spell - Using correct zone for from zone instead of constant Zone.Hand.
This commit is contained in:
parent
2928c6f6e6
commit
bf3108a0d0
1 changed files with 3 additions and 3 deletions
|
@ -184,14 +184,14 @@ public class Spell<T extends Spell<T>> implements StackObject, Card {
|
||||||
} else if (this.getCardType().contains(CardType.ENCHANTMENT) && this.getSubtype().contains("Aura")) {
|
} else if (this.getCardType().contains(CardType.ENCHANTMENT) && this.getSubtype().contains("Aura")) {
|
||||||
if (ability.getTargets().stillLegal(ability, game)) {
|
if (ability.getTargets().stillLegal(ability, game)) {
|
||||||
updateOptionalCosts(0);
|
updateOptionalCosts(0);
|
||||||
if (card.putOntoBattlefield(game, Zone.HAND, ability.getId(), controllerId)) {
|
if (card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId)) {
|
||||||
return ability.resolve(game);
|
return ability.resolve(game);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (this.getCardType().contains(CardType.CREATURE)) { // e.g. Creature with Bestow (rule confirmation yet missing)
|
if (this.getCardType().contains(CardType.CREATURE)) { // e.g. Creature with Bestow (rule confirmation yet missing)
|
||||||
updateOptionalCosts(0);
|
updateOptionalCosts(0);
|
||||||
result = card.putOntoBattlefield(game, Zone.HAND, ability.getId(), controllerId);
|
result = card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId);
|
||||||
return result;
|
return result;
|
||||||
} else {
|
} else {
|
||||||
//20091005 - 608.2b
|
//20091005 - 608.2b
|
||||||
|
@ -201,7 +201,7 @@ public class Spell<T extends Spell<T>> implements StackObject, Card {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
updateOptionalCosts(0);
|
updateOptionalCosts(0);
|
||||||
result = card.putOntoBattlefield(game, Zone.HAND, ability.getId(), controllerId);
|
result = card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue