From 2b2e55a142b0568b139c36c4076144c9db6e1c24 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Mon, 13 Oct 2014 01:34:35 +0000
Subject: [PATCH] Prevent crash potential when updating attacker for view

---
 forge-game/src/main/java/forge/game/card/CardView.java | 7 +++++--
 1 file changed, 5 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 32370ea5aa2..e33dda1f9e6 100644
--- a/forge-game/src/main/java/forge/game/card/CardView.java
+++ b/forge-game/src/main/java/forge/game/card/CardView.java
@@ -15,6 +15,7 @@ import forge.card.ColorSet;
 import forge.card.mana.ManaCost;
 import forge.game.Direction;
 import forge.game.GameEntityView;
+import forge.game.combat.Combat;
 import forge.game.player.Player;
 import forge.game.player.PlayerView;
 import forge.game.zone.ZoneType;
@@ -125,14 +126,16 @@ public class CardView extends GameEntityView {
         return get(TrackableProperty.Attacking);
     }
     void updateAttacking(Card c) {
-        set(TrackableProperty.Attacking, c.getGame().getCombat().isAttacking(c));
+        Combat combat = c.getGame().getCombat();
+        set(TrackableProperty.Attacking, combat == null ? false : combat.isAttacking(c));
     }
 
     public boolean isBlocking() {
         return get(TrackableProperty.Blocking);
     }
     void updateBlocking(Card c) {
-        set(TrackableProperty.Blocking, c.getGame().getCombat().isBlocking(c));
+        Combat combat = c.getGame().getCombat();
+        set(TrackableProperty.Blocking, combat == null ? false : combat.isBlocking(c));
     }
 
     public boolean isPhasedOut() {