diff --git a/src/main/java/forge/card/spellability/AbilityManaPart.java b/src/main/java/forge/card/spellability/AbilityManaPart.java index 7d8315aee49..8b1fb95442b 100644 --- a/src/main/java/forge/card/spellability/AbilityManaPart.java +++ b/src/main/java/forge/card/spellability/AbilityManaPart.java @@ -46,7 +46,6 @@ public class AbilityManaPart implements java.io.Serializable { private String lastExpressChoice = ""; private String manaRestrictions = ""; private transient ArrayList lastProduced = new ArrayList(); - private int amount = 1; /** The reflected. */ private boolean reflected = false; @@ -94,7 +93,7 @@ public class AbilityManaPart implements java.io.Serializable { * @param ability */ public final void produceMana(SpellAbility sa) { - this.produceMana(this.getManaProduced(), this.getSourceCard().getController(), sa); + this.produceMana(this.getOrigProduced(), this.getSourceCard().getController(), sa); } /** @@ -154,35 +153,6 @@ public class AbilityManaPart implements java.io.Serializable { } // end produceMana(String) - /** - *

- * getProducedMana. - *

- * - * @return a {@link java.lang.String} object. - */ - public String getManaProduced() { - StringBuilder sb = new StringBuilder(); - if (this.amount == 0) { - sb.append("0"); - } - else { - try { - // if baseMana is an integer(colorless), just multiply amount and baseMana - int base = Integer.parseInt(this.getOrigProduced()); - sb.append(base * this.amount); - } catch (NumberFormatException e) { - for (int i = 0; i < this.amount; i++) { - if (i != 0) { - sb.append(" "); - } - sb.append(mana()); - } - } - } - return sb.toString(); - } - /** *

* cannotCounterPaidWith. diff --git a/src/main/java/forge/control/input/InputPayManaCostUtil.java b/src/main/java/forge/control/input/InputPayManaCostUtil.java index c6bdb6c9cad..8085e682416 100644 --- a/src/main/java/forge/control/input/InputPayManaCostUtil.java +++ b/src/main/java/forge/control/input/InputPayManaCostUtil.java @@ -163,7 +163,7 @@ public class InputPayManaCostUtil { colorsProduced = m.getComboColors().split(" "); } else { - colorsProduced = m.getManaProduced().split(" "); + colorsProduced = m.getOrigProduced().split(" "); } for (final String color : colorsProduced) { if (manaCost.isColor(color)) { @@ -262,7 +262,7 @@ public class InputPayManaCostUtil { colorsProduced = m.getComboColors().split(" "); } else { - colorsProduced = m.getManaProduced().split(" "); + colorsProduced = m.getOrigProduced().split(" "); } for (final String color : colorsProduced) { if (mana.contains(color)) { diff --git a/src/main/java/forge/sound/EventVisualizer.java b/src/main/java/forge/sound/EventVisualizer.java index 76746ca8133..551bb1d9bd2 100644 --- a/src/main/java/forge/sound/EventVisualizer.java +++ b/src/main/java/forge/sound/EventVisualizer.java @@ -166,7 +166,7 @@ public class EventVisualizer { final List manaProduced = land.getManaAbility(); for (SpellAbility sa : manaProduced) { - String manaColors = sa.getManaPart().getManaProduced(); + String manaColors = sa.getManaPart().getOrigProduced(); if (manaColors.contains("B")) { return SoundEffectType.BlackLand;