diff --git a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java index 8b1c14b0f22..ba7e5b03995 100644 --- a/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java +++ b/Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java @@ -292,7 +292,7 @@ public class ManaCostsImpl extends ArrayList implements M private boolean canPayColoredManaFromPool(ManaType needColor, ManaCost cost, ManaType canUseManaType, ManaPool pool) { if (canUseManaType == null || canUseManaType.equals(needColor)) { return cost.containsColor(CardUtil.manaTypeToColoredManaSymbol(needColor)) - && (pool.getColoredAmount(needColor) > 0 || pool.ConditionalManaHasManaType(needColor)); + && (pool.getColoredAmount(needColor) > 0 || pool.conditionalManaHasManaType(needColor)); } return false; } diff --git a/Mage/src/main/java/mage/players/ManaPool.java b/Mage/src/main/java/mage/players/ManaPool.java index 1b7a6304b89..07e76de50ec 100644 --- a/Mage/src/main/java/mage/players/ManaPool.java +++ b/Mage/src/main/java/mage/players/ManaPool.java @@ -196,8 +196,7 @@ public class ManaPool implements Serializable { } } if (manaTypeToUse != null && mana.getConditionalMana().apply(ability, game, mana.getSourceId(), costToPay)) { - if (filter == null - || filter.match(mana.getSourceObject(), game)) { + if (filter == null || filter.match(mana.getSourceObject(), game)) { return new ConditionalManaInfo(manaTypeToUse, mana.getSourceObject()); } } @@ -239,18 +238,10 @@ public class ManaPool implements Serializable { this.manaBecomesBlack = manaBecomesBlack; } - public boolean isManaBecomesBlack() { - return manaBecomesBlack; - } - public void setManaBecomesColorless(boolean manaBecomesColorless) { this.manaBecomesColorless = manaBecomesColorless; } - public boolean isManaBecomesColorless() { - return manaBecomesColorless; - } - public void init() { manaItems.clear(); } @@ -393,7 +384,7 @@ public class ManaPool implements Serializable { return conditionalMana; } - public boolean ConditionalManaHasManaType(ManaType manaType) { + public boolean conditionalManaHasManaType(ManaType manaType) { for (ManaPoolItem item : manaItems) { if (item.isConditional()) { if (item.getConditionalMana().get(manaType) > 0) {