From 54fd8504b1f1e8374bfc170f9fa4400199412188 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 1 Jan 2016 13:09:35 +0100 Subject: [PATCH] [OGW] Fixed that support did add 2 counters to target permanent. --- .../effects/common/counter/AddCountersTargetEffect.java | 6 +++++- .../java/mage/abilities/effects/keyword/SupportEffect.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java index 9f421323473..c5e48f6f8d1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/AddCountersTargetEffect.java @@ -88,7 +88,11 @@ public class AddCountersTargetEffect extends OneShotEffect { if (permanent != null) { if (counter != null) { Counter newCounter = counter.copy(); - newCounter.add(amount.calculate(game, source, this)); + int calculated = amount.calculate(game, source, this); + if (calculated > 0 && newCounter.getCount() > 0) { + newCounter.remove(newCounter.getCount()); + } + newCounter.add(calculated); int before = permanent.getCounters().getCount(counter.getName()); permanent.addCounters(newCounter, game); int numberAdded = permanent.getCounters().getCount(counter.getName()) - before; diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java index 9d33f9cf9b7..cd416b1aad1 100644 --- a/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/keyword/SupportEffect.java @@ -57,7 +57,7 @@ public class SupportEffect extends AddCountersTargetEffect { } public SupportEffect(DynamicValue amount) { - super(CounterType.P1P1.createInstance(), new StaticValue(1)); + super(CounterType.P1P1.createInstance(0), new StaticValue(1)); this.amountSupportTargets = amount; this.staticText = setText(); }