external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix so summoning sickness icon appears initially

Browse Source
This commit is contained in:
drdev
2014-10-10 14:27:57 +00:00
parent 1a16381e82
commit dfb260286a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -278,6 +278,7 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
characteristicsMap.put(CardCharacteristicName.FaceDown, CardUtil.getFaceDownCharacteristic(this)); characteristicsMap.put(CardCharacteristicName.FaceDown, CardUtil.getFaceDownCharacteristic(this));
view.updateChangedColorWords(this); view.updateChangedColorWords(this);
view.updateChangedTypes(this); view.updateChangedTypes(this);
view.updateSickness(this);
} }
public boolean changeToState(final CardCharacteristicName state) { public boolean changeToState(final CardCharacteristicName state) {

4
forge-game/src/main/java/forge/game/card/CardView.java
View File

@@ -156,10 +156,10 @@ public class CardView extends GameEntityView {
return isFirstTurnControlled() && !getOriginal().hasHaste(); return isFirstTurnControlled() && !getOriginal().hasHaste();
} }
public boolean isSick() { public boolean isSick() {
return getZone() == ZoneType.Battlefield && hasSickness(); return getZone() == ZoneType.Battlefield && getOriginal().isCreature() && hasSickness();
} }
void updateSickness(Card c) { void updateSickness(Card c) {
set(TrackableProperty.Sickness, c.isInPlay() && c.isSick()); set(TrackableProperty.Sickness, c.isFirstTurnControlled());
} }
public boolean isTapped() { public boolean isTapped() {