From 277f9363fd1c0cefa52634c745e0f8e36d8804bf Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 1 Sep 2013 11:15:31 +0200 Subject: [PATCH] * Fury Charm - Fixed that Suspended Cards could not be cast, if last counter was removed with Fury Charm. --- Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java | 4 ++-- .../effects/common/counter/RemoveCounterSourceEffect.java | 3 ++- Mage/src/mage/cards/CardImpl.java | 6 +++--- Mage/src/mage/game/permanent/PermanentImpl.java | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java b/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java index facc65b445..16ba332adc 100644 --- a/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java +++ b/Mage.Sets/src/mage/sets/planarchaos/FuryCharm.java @@ -150,12 +150,12 @@ class FuryCharmRemoveCounterEffect extends OneShotEffect> extends MageObjectImpl @Override public void removeCounters(String name, int amount, Game game) { - counters.removeCounter(name, amount); - GameEvent event = GameEvent.getEvent(GameEvent.EventType.COUNTER_REMOVED, objectId, ownerId); - event.setData(name); for (int i = 0; i < amount; i++) { + counters.removeCounter(name, 1); + GameEvent event = GameEvent.getEvent(GameEvent.EventType.COUNTER_REMOVED, objectId, ownerId); + event.setData(name); game.fireEvent(event); } } diff --git a/Mage/src/mage/game/permanent/PermanentImpl.java b/Mage/src/mage/game/permanent/PermanentImpl.java index ec09f63d44..a0a453fbe6 100644 --- a/Mage/src/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/mage/game/permanent/PermanentImpl.java @@ -237,10 +237,10 @@ public abstract class PermanentImpl> extends CardImpl @Override public void removeCounters(String name, int amount, Game game) { - counters.removeCounter(name, amount); - GameEvent event = GameEvent.getEvent(GameEvent.EventType.COUNTER_REMOVED, objectId, controllerId); - event.setData(name); for (int i = 0; i < amount; i++) { + counters.removeCounter(name, 1); + GameEvent event = GameEvent.getEvent(GameEvent.EventType.COUNTER_REMOVED, objectId, controllerId); + event.setData(name); game.fireEvent(event); } }