From 4ef997e078fc8f494dfd4da45ea189d632636fd8 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 22:12:47 +0000 Subject: [PATCH] *Suppressed CounterAdded triggers when adding counters to cards via etbCounter or Bloodthirst keywords. --- src/forge/card/cardFactory/CardFactory.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/forge/card/cardFactory/CardFactory.java b/src/forge/card/cardFactory/CardFactory.java index 3897ba9619e..89df1c82a1b 100644 --- a/src/forge/card/cardFactory/CardFactory.java +++ b/src/forge/card/cardFactory/CardFactory.java @@ -977,7 +977,11 @@ 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 @@ -991,7 +995,13 @@ 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"); + } } });