From d7ea4cdf6ab46b930fbf45cb9831d462cfc574cc Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Thu, 13 Jul 2017 06:32:29 +0000
Subject: [PATCH] - NPE prevention for RememberMap in Card.

---
 forge-game/src/main/java/forge/game/card/Card.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 5f15d234596..d008ef535cb 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -5408,8 +5408,10 @@ public class Card extends GameEntity implements Comparable<Card> {
             for (SpellAbility sa : source.getSpellAbilities()) {
                 if (sa.getActivatingPlayer() == null) continue;
                 for (Player p : AbilityUtils.getDefinedPlayers(source, property.split("RememberMap_")[1], sa)) {
-                    if (source.getRememberMap().get(p).contains(this)) {
-                        return true;
+                    if (source.getRememberMap() != null && source.getRememberMap().get(p) != null) {
+                        if (source.getRememberMap().get(p).contains(this)) {
+                            return true;
+                        }
                     }
                 }
             }