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

Fixed EntersBattlefieldEffect. PhantasmalImage's CopyEffect works now.

Browse source
This commit is contained in:
magenoxx 2012-03-26 20:05:20 +04:00
parent 3e006b2f55
commit 0b75e4866a
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java
View file

@ -27,7 +27,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase {
assertLife(playerA, 20);
assertLife(playerB, 20);
assertPermanentCount(playerA, "Phantasmal Image", 1);
assertPermanentCount(playerA, "Craw Wurm", 1);
assertPermanentCount(playerB, "Craw Wurm", 1);
}

10
Mage/src/mage/abilities/effects/EntersBattlefieldEffect.java
View file

@ -34,7 +34,6 @@ import mage.abilities.Mode;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
import mage.game.stack.Spell;
/**
*
@ -80,17 +79,20 @@ public class EntersBattlefieldEffect extends ReplacementEffectImpl<EntersBattlef
@Override
public boolean replaceEvent(GameEvent event, Ability source, Game game) {
Spell spell = game.getStack().getSpell(event.getSourceId());
//Spell spell = game.getStack().getSpell(event.getSourceId());
for (Effect effect: baseEffects) {
if (source.activate(game, false)) {
if (effect instanceof ContinuousEffect) {
game.addEffect((ContinuousEffect) effect, source);
}
else {
if (spell != null)
// noxx: commented it out because of resulting in a bug
// with CopyEffect (PhantasmalImageTest.java)
/*if (spell != null)
effect.apply(game, spell.getSpellAbility());
else
effect.apply(game, source);
effect.apply(game, source);*/
effect.apply(game, source);
}
}
}