From d6a08fbdd7f80c862e749b1107e47e5120856562 Mon Sep 17 00:00:00 2001
From: Zzooouhh <Zzooouhh@users.noreply.github.com>
Date: Thu, 7 Dec 2017 01:01:52 +0100
Subject: [PATCH] NullPointerException fix

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

diff --git a/Mage/src/main/java/mage/game/combat/Combat.java b/Mage/src/main/java/mage/game/combat/Combat.java
index 45b7894b720..d26bc9ec608 100644
--- a/Mage/src/main/java/mage/game/combat/Combat.java
+++ b/Mage/src/main/java/mage/game/combat/Combat.java
@@ -578,6 +578,9 @@ public class Combat implements Serializable, Copyable<Combat> {
      * @param game
      */
     private void retrieveMustBlockAttackerRequirements(Player attackingPlayer, Game game) {
+        if (attackingPlayer == null) {
+            return;
+        }
         if (!game.getContinuousEffects().existRequirementEffects()) {
             return;
         }