diff --git a/src/forge/Card.java b/src/forge/Card.java index d0401e530dd..202294627bf 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -535,13 +535,15 @@ public class Card extends MyObservable { counters.remove(p1Counter); } } - + //Run triggers HashMap runParams = new HashMap(); runParams.put("Card", this); runParams.put("CounterType", counterName); - AllZone.TriggerHandler.runTrigger("CounterAdded", runParams); - + for(int i=0;i<(multiplier*n);i++) + { + AllZone.TriggerHandler.runTrigger("CounterAdded", runParams); + } AllZone.GameAction.checkStateEffects(); diff --git a/src/forge/card/cardFactory/CardFactory.java b/src/forge/card/cardFactory/CardFactory.java index 32e5659bfb3..da0ec5d5ab1 100644 --- a/src/forge/card/cardFactory/CardFactory.java +++ b/src/forge/card/cardFactory/CardFactory.java @@ -802,12 +802,8 @@ public class CardFactory implements NewConstants { public void resolve() { int totalCounters = numCreatures[0] * multiplier; - AllZone.TriggerHandler.suppressMode("CounterAdded"); - card.addCounter(Counters.P1P1, totalCounters); - AllZone.TriggerHandler.clearSuppression("CounterAdded"); - if(card.getName().equals("Skullmulcher")) { for(int i = 0; i < numCreatures[0]; i++) { card.getController().drawCard(); @@ -975,11 +971,9 @@ public class CardFactory implements NewConstants { else { toAdd = Integer.parseInt(numCounters); } - AllZone.TriggerHandler.suppressMode("CounterAdded"); card.addCounter(counter, toAdd); - AllZone.TriggerHandler.clearSuppression("CounterAdded"); } });//ComesIntoPlayCommand } // if etbCounter @@ -994,11 +988,9 @@ public class CardFactory implements NewConstants { public void execute() { if(card.getController().getOpponent().getAssignedDamage() > 0) { - AllZone.TriggerHandler.suppressMode("CounterAdded"); card.addCounter(Counters.P1P1, count); - AllZone.TriggerHandler.clearSuppression("CounterAdded"); } }