From 09f9f7daf17a7510766aefb90d84c97a0148c217 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 14 Nov 2012 18:56:48 +0000 Subject: [PATCH] - Fixed a bug in the "Spend only mana on X" routine that disabled the confirmation button if the wrong type of land was clicked, even if some mana of correct color was already paid before. --- src/main/java/forge/control/input/InputPayManaX.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/control/input/InputPayManaX.java b/src/main/java/forge/control/input/InputPayManaX.java index c8fcb977470..d9eecf23b0d 100644 --- a/src/main/java/forge/control/input/InputPayManaX.java +++ b/src/main/java/forge/control/input/InputPayManaX.java @@ -36,14 +36,15 @@ public class InputPayManaX extends InputPayMana { @Override public void showMessage() { - if ((xPaid == 0 && costMana.isxCantBe0()) || !this.manaCost.toString().equals(strX)) { + if ((xPaid == 0 && costMana.isxCantBe0()) || (this.colorX.equals("") + && !this.manaCost.toString().equals(strX))) { ButtonUtil.enableOnlyCancel(); // only cancel if partially paid an X value // or X is 0, and x can't be 0 } else { ButtonUtil.enableAll(); } - + StringBuilder msg = new StringBuilder("Pay X Mana Cost for "); msg.append(sa.getSourceCard().getName()).append("\n").append(this.xPaid); msg.append(" Paid so far.");