From 23d7713498b720ea950dc63d4be46df24fc9b1f0 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 12 Jul 2015 09:01:40 +0200
Subject: [PATCH] Fixed possible npe during combat.

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

diff --git a/Mage/src/mage/game/combat/Combat.java b/Mage/src/mage/game/combat/Combat.java
index 2c61cdbf047..4cc23e31414 100644
--- a/Mage/src/mage/game/combat/Combat.java
+++ b/Mage/src/mage/game/combat/Combat.java
@@ -166,13 +166,13 @@ public class Combat implements Serializable, Copyable<Combat> {
     public void checkForRemoveFromCombat(Game game) {
         for (UUID creatureId : getAttackers()) {
             Permanent creature = game.getPermanent(creatureId);
-            if (!creature.getCardType().contains(CardType.CREATURE)) {
+            if (creature != null && !creature.getCardType().contains(CardType.CREATURE)) {
                 removeFromCombat(creatureId, game, true);
             }
         }
         for (UUID creatureId : getBlockers()) {
             Permanent creature = game.getPermanent(creatureId);
-            if (!creature.getCardType().contains(CardType.CREATURE)) {
+            if (creature != null && !creature.getCardType().contains(CardType.CREATURE)) {
                 removeFromCombat(creatureId, game, true);
             }
         }
@@ -246,7 +246,6 @@ public class Combat implements Serializable, Copyable<Combat> {
     }
 
     public void resumeSelectAttackers(Game game) {
-        Player player = game.getPlayer(attackerId);
         for (CombatGroup group : groups) {
             for (UUID attacker : group.getAttackers()) {
                 game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ATTACKER_DECLARED, group.defenderId, attacker, attackerId));
@@ -254,7 +253,10 @@ public class Combat implements Serializable, Copyable<Combat> {
         }
         game.fireEvent(GameEvent.getEvent(GameEvent.EventType.DECLARED_ATTACKERS, attackerId, attackerId));
         if (!game.isSimulation()) {
-            game.informPlayers(new StringBuilder(player.getLogName()).append(" attacks with ").append(groups.size()).append(groups.size() == 1 ? " creature" : " creatures").toString());
+            Player player = game.getPlayer(attackerId);
+            if (player != null) {
+                game.informPlayers(player.getLogName() + " attacks with " + groups.size() + (groups.size() == 1 ? " creature" : " creatures"));
+            }
         }
     }