From bd43cf0e1e67a189951fe055fb963e8b16c6c478 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 7 Mar 2016 16:28:24 +0100
Subject: [PATCH] * Fixed possible exception when planswalker were removed from
 battlefield.

---
 Mage/src/main/java/mage/game/combat/Combat.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java
index a78dc1738c6..c815f9ad97e 100644
--- a/Mage/src/main/java/mage/game/combat/Combat.java
+++ b/Mage/src/main/java/mage/game/combat/Combat.java
@@ -830,8 +830,7 @@ public class Combat implements Serializable, Copyable<Combat> {
                                 blockIsValid = true;
                                 break CombatGroups;
                             } else // check if the blocker blocks a attacker that must be blocked at least by one and is the only blocker, this block is also valid
-                            {
-                                if (combatGroup.getBlockers().size() == 1) {
+                             if (combatGroup.getBlockers().size() == 1) {
                                     if (mustBeBlockedByAtLeastOne.containsKey(forcingAttackerId)) {
                                         if (mustBeBlockedByAtLeastOne.get(forcingAttackerId).contains(creatureForcedToBlock.getId())) {
                                             blockIsValid = true;
@@ -839,7 +838,6 @@ public class Combat implements Serializable, Copyable<Combat> {
                                         }
                                     }
                                 }
-                            }
                         }
                     }
                 }
@@ -1113,7 +1111,7 @@ public class Combat implements Serializable, Copyable<Combat> {
     public boolean removePlaneswalkerFromCombat(UUID planeswalkerId, Game game, boolean withInfo) {
         boolean result = false;
         for (CombatGroup group : groups) {
-            if (group.getDefenderId().equals(planeswalkerId)) {
+            if (group.getDefenderId() != null && group.getDefenderId().equals(planeswalkerId)) {
                 group.removeAttackedPlaneswalker(planeswalkerId);
                 result = true;
             }