From 7bf5ccc6e9a535e3e809d995e5200c6a62c84f86 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Tue, 20 Sep 2011 15:58:29 +0000
Subject: [PATCH] isSick removed from Card in favour of hasSickness

---
 src/main/java/forge/Card.java                | 19 +------------------
 src/main/java/forge/CombatUtil.java          |  2 +-
 src/main/java/forge/EndOfTurn.java           |  2 +-
 src/main/java/forge/card/cost/CostTap.java   |  2 +-
 src/main/java/forge/card/cost/CostUntap.java |  2 +-
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 996c97d3fc7..12655edb562 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -2719,24 +2719,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      * @return a boolean.
      */
     public final boolean hasSickness() {
-        if (hasKeyword("Haste")) {
-            return false;
-        }
-
-        return sickness;
-    }
-
-    /**
-     * <p>isSick.</p>
-     *
-     * @return a boolean.
-     */
-    public final boolean isSick() {
-        if (hasKeyword("Haste")) {
-            return false;
-        }
-
-        return sickness && isCreature();
+        return !hasKeyword("Haste") && sickness;
     }
 
     /**
diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java
index b314d7d83ac..5209de09954 100644
--- a/src/main/java/forge/CombatUtil.java
+++ b/src/main/java/forge/CombatUtil.java
@@ -463,7 +463,7 @@ public class CombatUtil {
      * @return a boolean.
      */
     public static boolean canAttack(Card c) {
-        if (c.isTapped() || (c.isSick() && !c.isEnchantedBy("Instill Energy"))) return false;
+        if (c.isTapped() || (c.hasSickness() && !c.isEnchantedBy("Instill Energy"))) return false;
 
         return canAttackNextTurn(c);
     }
diff --git a/src/main/java/forge/EndOfTurn.java b/src/main/java/forge/EndOfTurn.java
index 2d2bd976d66..2f24bdf009e 100644
--- a/src/main/java/forge/EndOfTurn.java
+++ b/src/main/java/forge/EndOfTurn.java
@@ -167,7 +167,7 @@ public class EndOfTurn implements java.io.Serializable {
 
             }
             if (c.getName().equals("Erg Raiders") && !c.getCreatureAttackedThisTurn()
-                    && !c.isSick() && AllZone.getPhase().isPlayerTurn(c.getController()))
+                    && !c.hasSickness() && AllZone.getPhase().isPlayerTurn(c.getController()))
             {
                 final Card raider = c;
                 final SpellAbility change = new Ability(raider, "0") {
diff --git a/src/main/java/forge/card/cost/CostTap.java b/src/main/java/forge/card/cost/CostTap.java
index 2998e8d877c..8d6e822b6a6 100644
--- a/src/main/java/forge/card/cost/CostTap.java
+++ b/src/main/java/forge/card/cost/CostTap.java
@@ -22,7 +22,7 @@ public class CostTap extends CostPart {
 
     @Override
     public boolean canPay(SpellAbility ability, Card source, Player activator, Cost cost) {
-        return !(source.isTapped() || source.isSick());
+        return source.isUntapped() && (!source.hasSickness() || !source.isCreature());  
     }
 
     @Override
diff --git a/src/main/java/forge/card/cost/CostUntap.java b/src/main/java/forge/card/cost/CostUntap.java
index 632b558b228..4939f8a91bf 100644
--- a/src/main/java/forge/card/cost/CostUntap.java
+++ b/src/main/java/forge/card/cost/CostUntap.java
@@ -22,7 +22,7 @@ public class CostUntap extends CostPart {
 
     @Override
     public boolean canPay(SpellAbility ability, Card source, Player activator, Cost cost) {
-        return !(source.isUntapped() || source.isSick());
+        return source.isTapped() && (!source.hasSickness() || !source.isCreature());
     }
 
     @Override