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

* Made a lot of changes to handling of continuous and triggered abilities. This should fix the problems with Mage Singletons like Flyinging / Intimidate / Reach not working. Fixed also #533 and some other problems with copy effects of cards like Clone that did not end if e.g. Clone left the battlefield.

Browse source
This commit is contained in:
LevelX2 2014-12-25 02:07:40 +01:00
parent f9b80e5c81
commit 4f1368f3de
25 changed files with 316 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -211,7 +211,7 @@ public class Spell implements StackObject, Card {
}
}
if (game.getState().getZone(card.getId()) == Zone.STACK) {
card.moveToZone(Zone.GRAVEYARD, ability.getId(), game, false);
card.moveToZone(Zone.GRAVEYARD, ability.getSourceId(), game, false);
}
}
return result;
@ -229,7 +229,7 @@ public class Spell implements StackObject, Card {
// Otherwise effects like evolve trigger from creature comes into play event
card.getCardType().remove(CardType.CREATURE);
}
if (card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId)) {
if (card.putOntoBattlefield(game, fromZone, ability.getSourceId(), controllerId)) {
if (bestow) {
// card will be copied during putOntoBattlefield, so the card of CardPermanent has to be changed
// TODO: Find a better way to prevent bestow creatures from being effected by creature affecting abilities
@ -250,7 +250,7 @@ public class Spell implements StackObject, Card {
// Aura has no legal target and its a bestow enchantment -> Add it to battlefield as creature
if (this.getSpellAbility() instanceof BestowAbility) {
updateOptionalCosts(0);
result = card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId);
result = card.putOntoBattlefield(game, fromZone, ability.getSourceId(), controllerId);
return result;
} else {
//20091005 - 608.2b
@ -263,7 +263,7 @@ public class Spell implements StackObject, Card {
if (isFaceDown()) {
card.setFaceDown(true);
}
result = card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId);
result = card.putOntoBattlefield(game, fromZone, ability.getSourceId(), controllerId);
return result;
}
}