From 448dbeaa462c40ae2b0d8b64bace26c5f03eb5c7 Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Thu, 11 Feb 2016 14:46:58 +0000
Subject: [PATCH] - Add some NPE checks in Combat View

---
 forge-game/src/main/java/forge/game/combat/CombatView.java | 4 ++--
 forge-gui/res/cardsfolder/r/reckless_bushwhacker.txt       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/combat/CombatView.java b/forge-game/src/main/java/forge/game/combat/CombatView.java
index 9c054f5a624..9826fdeb4bc 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatView.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatView.java
@@ -140,7 +140,7 @@ public class CombatView extends TrackableObject {
         }
         final FCollection<CardView> views = new FCollection<CardView>();
         for (final Entry<CardView, GameEntityView> entry : attackersWithDefenders) {
-            if (entry.getValue().equals(defender)) {
+            if (defender != null && defender.equals(entry.getValue())) {
                 views.add(entry.getKey());
             }
         }
@@ -153,7 +153,7 @@ public class CombatView extends TrackableObject {
         }
         final List<FCollection<CardView>> views = new ArrayList<FCollection<CardView>>();
         for (final Entry<FCollection<CardView>, GameEntityView> entry : bandsWithDefenders) {
-            if (entry.getValue().equals(defender)) {
+            if (defender != null && defender.equals(entry.getValue())) {
                 views.add(entry.getKey());
             }
         }
diff --git a/forge-gui/res/cardsfolder/r/reckless_bushwhacker.txt b/forge-gui/res/cardsfolder/r/reckless_bushwhacker.txt
index 65eb2f67ec9..f695c5a264b 100644
--- a/forge-gui/res/cardsfolder/r/reckless_bushwhacker.txt
+++ b/forge-gui/res/cardsfolder/r/reckless_bushwhacker.txt
@@ -8,4 +8,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigPumpAll:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl+Other | NumAtt$ 1 | KW$ Haste
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reckless_bushwhacker.jpg
-Oracle:Surge 1R (You may cast this spell for its surge cost if you or a teammate has cast another spell this turn.)\nHaste\nWhen Reckless Bushwhacker enters the battlefield, if its surge cost was paid, other creatures you control get +1/+0 and gain haste until end of turn.
+Oracle:Surge {1}{R} (You may cast this spell for its surge cost if you or a teammate has cast another spell this turn.)\nHaste\nWhen Reckless Bushwhacker enters the battlefield, if its surge cost was paid, other creatures you control get +1/+0 and gain haste until end of turn.