From db1e55186f2e402a9b416e9d708b4bd216f8f3a0 Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 01:47:39 +0000 Subject: [PATCH] fixed Exception when using Count$TimesKicked --- src/forge/card/cardFactory/CardFactoryUtil.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/forge/card/cardFactory/CardFactoryUtil.java b/src/forge/card/cardFactory/CardFactoryUtil.java index ceedfafe3e5..8f563036c8f 100644 --- a/src/forge/card/cardFactory/CardFactoryUtil.java +++ b/src/forge/card/cardFactory/CardFactoryUtil.java @@ -2548,17 +2548,7 @@ public class CardFactoryUtil { return doXMath(Integer.parseInt(sq[1]), m, c); // Have Threshold else return doXMath(Integer.parseInt(sq[2]), m, c); // not Threshold - } - - //Count$Kicked.. - if (sq[0].contains("Kicked")) - { - if (c.isKicked()) - return doXMath(Integer.parseInt(sq[1]), m, c); // kicked - else - return doXMath(Integer.parseInt(sq[2]), m, c); // not kicked - } - + } // Count$CardPower if(sq[0].contains("CardPower")) return doXMath(c.getNetAttack(), m, c);