From e9bc0f92f7019d06fa33ee50a74a203b9ce3fd0f Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 26 Nov 2012 19:39:34 +0000 Subject: [PATCH] - More cleanup of xCount. --- .../java/forge/card/cardfactory/CardFactoryUtil.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 1ec88765ac2..5ce2e7ebd3b 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -1921,13 +1921,6 @@ public class CardFactoryUtil { return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c); // not Kicked } } - if (sq[0].startsWith("Kicked")) { - if (sa.isKicked()) { - return CardFactoryUtil.doXMath(Integer.parseInt(sq[1]), m, c); // Kicked - } else { - return CardFactoryUtil.doXMath(Integer.parseInt(sq[2]), m, c); // not Kicked - } - } } return xCount(c, s); } @@ -2091,7 +2084,7 @@ public class CardFactoryUtil { return CardFactoryUtil.doXMath(c.getController().getBloodthirstAmount(), m, c); } - if (sq[0].contains("RegeneratedThisTurn")) { + if (sq[0].equals("RegeneratedThisTurn")) { return CardFactoryUtil.doXMath(c.getRegeneratedThisTurn(), m, c); }