From 7a4a0b9faa0f175d065d5759e48287a06ed5f6b9 Mon Sep 17 00:00:00 2001 From: igoudt Date: Wed, 26 Apr 2017 21:01:27 +0200 Subject: [PATCH] move removeVariableManaCost from CardUtil to ManaCosts interface --- .../java/mage/abilities/costs/mana/ManaCosts.java | 12 ++++++++++++ Mage/src/main/java/mage/util/CardUtil.java | 10 +--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java index 2fe86c5345a..4a129a6cc15 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCosts.java @@ -61,4 +61,16 @@ public interface ManaCosts extends List, ManaCost { @Override ManaCosts copy(); + + static ManaCosts removeVariableManaCost(ManaCosts m) { + ManaCosts manaCosts = new ManaCostsImpl<>(); + for(ManaCost manaCost : m){ + if(!(manaCost instanceof VariableManaCost)){ + manaCosts.add(manaCost); + + } + } + return manaCosts; + } + } diff --git a/Mage/src/main/java/mage/util/CardUtil.java b/Mage/src/main/java/mage/util/CardUtil.java index 2a89380ec71..7298f274c6b 100644 --- a/Mage/src/main/java/mage/util/CardUtil.java +++ b/Mage/src/main/java/mage/util/CardUtil.java @@ -163,15 +163,7 @@ public final class CardUtil { return adjustedCost; } - public static ManaCosts removeVariableManaCost(ManaCosts manaCosts) { - ManaCosts adjustedCost = new ManaCostsImpl<>(); - for (ManaCost manaCost : manaCosts) { - if (!(manaCost instanceof VariableManaCost)) { - adjustedCost.add(manaCost); - } - } - return adjustedCost; - } + public static void reduceCost(SpellAbility spellAbility, ManaCosts manaCostsToReduce) { adjustCost(spellAbility, manaCostsToReduce, true);