From 5f31f8c69a621525662f9252b7bcf0999645f149 Mon Sep 17 00:00:00 2001
From: Tobias <23401986+Keraldi@users.noreply.github.com>
Date: Tue, 5 Nov 2019 03:20:54 +0100
Subject: [PATCH] Should fix all NPEs encountered because of nonexistant task
 maps (#1667)

---
 .../bloodmagic/util/handler/event/GenericHandler.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
index 9a2c457d..93b9a135 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
@@ -250,9 +250,11 @@ public class GenericHandler {
                         targetTaskMap.remove(animal);
                         attackTaskMap.remove(animal);
                     }
-                } else if (targetTaskMap.containsKey(animal)) {
-                    targetTaskMap.remove(animal);
-                    attackTaskMap.remove(animal);
+                } else {
+                    if (targetTaskMap != null)
+                        targetTaskMap.remove(animal);
+                    if (attackTaskMap != null)
+                        attackTaskMap.remove(animal);
                 }
             }
         }