From 385313bd64bf9472b6ab746006bedf5ceafe9fcb Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 1 Mar 2016 21:41:05 +0100 Subject: [PATCH] Fixed error of CastFromHandCondition. --- .../java/mage/watchers/common/CastFromHandWatcher.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java b/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java index 805423c19f..da34b23909 100644 --- a/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastFromHandWatcher.java @@ -37,11 +37,11 @@ public class CastFromHandWatcher extends Watcher { step = null; } if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone().equals(Zone.HAND)) { - step = game.getTurn().getStep(); - Spell spell = (Spell) game.getObject(event.getTargetId()); - if (this.getSourceId().equals(spell.getSourceId())) { - condition = true; + if (step == null) { + step = game.getTurn().getStep(); } + Spell spell = (Spell) game.getObject(event.getTargetId()); + spellsCastFromHand.add(spell.getSourceId()); } }