From dfb260286a6a9fdae0b35fa02e427d5a59925e8b Mon Sep 17 00:00:00 2001 From: drdev Date: Fri, 10 Oct 2014 14:27:57 +0000 Subject: [PATCH] Fix so summoning sickness icon appears initially --- forge-game/src/main/java/forge/game/card/Card.java | 1 + forge-game/src/main/java/forge/game/card/CardView.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 6367e3099fd..c6197eb6e33 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -278,6 +278,7 @@ public class Card extends GameEntity implements Comparable, IIdentifiable characteristicsMap.put(CardCharacteristicName.FaceDown, CardUtil.getFaceDownCharacteristic(this)); view.updateChangedColorWords(this); view.updateChangedTypes(this); + view.updateSickness(this); } public boolean changeToState(final CardCharacteristicName state) { diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java index 4a27e6ab4fe..f7eaf34f8c5 100644 --- a/forge-game/src/main/java/forge/game/card/CardView.java +++ b/forge-game/src/main/java/forge/game/card/CardView.java @@ -156,10 +156,10 @@ public class CardView extends GameEntityView { return isFirstTurnControlled() && !getOriginal().hasHaste(); } public boolean isSick() { - return getZone() == ZoneType.Battlefield && hasSickness(); + return getZone() == ZoneType.Battlefield && getOriginal().isCreature() && hasSickness(); } void updateSickness(Card c) { - set(TrackableProperty.Sickness, c.isInPlay() && c.isSick()); + set(TrackableProperty.Sickness, c.isFirstTurnControlled()); } public boolean isTapped() {