From 8f19e94dc0de7d9be1dcfe2868f43596f2aa57bb Mon Sep 17 00:00:00 2001 From: Plopman Date: Tue, 8 Jan 2013 17:25:10 +0100 Subject: [PATCH] Fixed issue #96 Nissa's choosen --- Mage.Sets/src/mage/sets/zendikar/NissasChosen.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/zendikar/NissasChosen.java b/Mage.Sets/src/mage/sets/zendikar/NissasChosen.java index fb26389227..edcf243f63 100644 --- a/Mage.Sets/src/mage/sets/zendikar/NissasChosen.java +++ b/Mage.Sets/src/mage/sets/zendikar/NissasChosen.java @@ -60,7 +60,7 @@ public class NissasChosen extends CardImpl { this.power = new MageInt(2); this.toughness = new MageInt(3); - this.addAbility(new SimpleStaticAbility(Zone.ALL, new NissasChosenEffect())); + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NissasChosenEffect())); } public NissasChosen(final NissasChosen card) { @@ -97,7 +97,7 @@ class NissasChosenEffect extends ReplacementEffectImpl { @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { Card card = game.getCard(event.getTargetId()); - if ( card != null && event.getTargetId().equals(source.getSourceId()) ) { + if ( card != null ) { return card.moveToZone(Zone.LIBRARY, source.getId(), game, false); } return false; @@ -105,12 +105,12 @@ class NissasChosenEffect extends ReplacementEffectImpl { @Override public boolean applies(GameEvent event, Ability source, Game game) { - if ( event.getType() == EventType.ZONE_CHANGE ) + if ( event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(source.getSourceId()) ) { - ZoneChangeEvent zEvent = (ZoneChangeEvent)event; - if ( zEvent.getFromZone() == Zone.BATTLEFIELD && zEvent.getToZone() == Zone.GRAVEYARD ) { - return true; - } + ZoneChangeEvent zEvent = (ZoneChangeEvent)event; + if ( zEvent.getFromZone() == Zone.BATTLEFIELD && zEvent.getToZone() == Zone.GRAVEYARD ) { + return true; + } } return false; }