From b2582de88593f1333aec9d02efe75707e360f762 Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 7 Apr 2013 09:19:16 +0000 Subject: [PATCH] - Fixed Unless costs with colored mana (Chain Lightning). --- src/main/java/forge/card/ability/AbilityUtils.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/forge/card/ability/AbilityUtils.java b/src/main/java/forge/card/ability/AbilityUtils.java index adf1b6a9b2b..5dadba03546 100644 --- a/src/main/java/forge/card/ability/AbilityUtils.java +++ b/src/main/java/forge/card/ability/AbilityUtils.java @@ -1100,13 +1100,9 @@ public class AbilityUtils { ManaCostBeingPaid newCost = new ManaCostBeingPaid(unlessCost.toString()); newCost.decreaseColorlessMana(2); unlessCost = newCost.toString(); - } else if( unlessCost.indexOf('<') < 0 ) { // if cost has '<' or '>' signs - it's definitely not a variable - try { - String unlessVar = Integer.toString(calculateAmount(source, sa.getParam("UnlessCost").replace(" ", ""), sa)); - unlessCost = unlessVar; - } catch (final NumberFormatException n) { - } //This try/catch method enables UnlessCost to parse any svar name - //instead of just X for cards like Draco. + } else if( !StringUtils.isBlank(sa.getSVar(unlessCost)) || !StringUtils.isBlank(source.getSVar(unlessCost))) { + // check for X costs (stored in SVars + unlessCost = Integer.toString(calculateAmount(source, sa.getParam("UnlessCost").replace(" ", ""), sa)); } final Cost cost = new Cost(source, unlessCost, true);