From 5d8d9291aeab4324e2e36d338c65332f9d387fbf Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 20 Apr 2020 17:53:50 -0400 Subject: [PATCH] fixed ability counter creation not using amount --- .../java/mage/counters/AbilityCounter.java | 4 ---- .../main/java/mage/counters/CounterType.java | 22 +++++++++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Mage/src/main/java/mage/counters/AbilityCounter.java b/Mage/src/main/java/mage/counters/AbilityCounter.java index 217660e3af2..1f153c09c1f 100644 --- a/Mage/src/main/java/mage/counters/AbilityCounter.java +++ b/Mage/src/main/java/mage/counters/AbilityCounter.java @@ -9,10 +9,6 @@ public class AbilityCounter extends Counter { private final Ability ability; - AbilityCounter(Ability ability) { - this(ability, 1); - } - AbilityCounter(Ability ability, int count) { super(ability.getRule(), count); this.ability = ability; diff --git a/Mage/src/main/java/mage/counters/CounterType.java b/Mage/src/main/java/mage/counters/CounterType.java index 9e2e5dae512..cd3c79be8c3 100644 --- a/Mage/src/main/java/mage/counters/CounterType.java +++ b/Mage/src/main/java/mage/counters/CounterType.java @@ -208,27 +208,27 @@ public enum CounterType { case M2M2: return new BoostCounter(-2, -2, amount); case DEATHTOUCH: - return new AbilityCounter(DeathtouchAbility.getInstance()); + return new AbilityCounter(DeathtouchAbility.getInstance(), amount); case DOUBLE_STRIKE: - return new AbilityCounter(DoubleStrikeAbility.getInstance()); + return new AbilityCounter(DoubleStrikeAbility.getInstance(), amount); case FIRST_STRIKE: - return new AbilityCounter(FirstStrikeAbility.getInstance()); + return new AbilityCounter(FirstStrikeAbility.getInstance(), amount); case FLYING: - return new AbilityCounter(FlyingAbility.getInstance()); + return new AbilityCounter(FlyingAbility.getInstance(), amount); case HEXPROOF: - return new AbilityCounter(HexproofAbility.getInstance()); + return new AbilityCounter(HexproofAbility.getInstance(), amount); case INDESTRUCTIBLE: - return new AbilityCounter(IndestructibleAbility.getInstance()); + return new AbilityCounter(IndestructibleAbility.getInstance(), amount); case LIFELINK: - return new AbilityCounter(LifelinkAbility.getInstance()); + return new AbilityCounter(LifelinkAbility.getInstance(), amount); case MENACE: - return new AbilityCounter(new MenaceAbility()); + return new AbilityCounter(new MenaceAbility(), amount); case REACH: - return new AbilityCounter(ReachAbility.getInstance()); + return new AbilityCounter(ReachAbility.getInstance(), amount); case TRAMPLE: - return new AbilityCounter(TrampleAbility.getInstance()); + return new AbilityCounter(TrampleAbility.getInstance(), amount); case VIGILANCE: - return new AbilityCounter(VigilanceAbility.getInstance()); + return new AbilityCounter(VigilanceAbility.getInstance(), amount); default: return new Counter(name, amount); }