From dc93196b5626d320608f1347101a07d16f68b16e Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Tue, 2 Dec 2014 04:18:45 +0000
Subject: [PATCH] Fix crash when starting game

---
 forge-game/src/main/java/forge/game/card/CardView.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 cde8272c46f..1cd5267dbd0 100644
--- a/forge-game/src/main/java/forge/game/card/CardView.java
+++ b/forge-game/src/main/java/forge/game/card/CardView.java
@@ -762,7 +762,7 @@ public class CardView extends GameEntityView {
             return get(TrackableProperty.Power);
         }
         void updatePower(Card c) {
-            if (c.getCurrentState().getView() == this) {
+            if (c.getCurrentState().getView() == this || !c.hasAlternateState()) {
                 set(TrackableProperty.Power, c.getNetPower());
             }
             else {
@@ -782,7 +782,7 @@ public class CardView extends GameEntityView {
             return get(TrackableProperty.Toughness);
         }
         void updateToughness(Card c) {
-            if (c.getCurrentState().getView() == this) {
+            if (c.getCurrentState().getView() == this || !c.hasAlternateState()) {
                 set(TrackableProperty.Toughness, c.getNetToughness());
             }
             else {