From b28f08dccacf7ab724b6c2398be3de0e6fae5e05 Mon Sep 17 00:00:00 2001
From: Alex 'mcmonkey' Goodwin <agoodwin@freneticllc.com>
Date: Sat, 16 Jan 2021 07:42:03 -0800
Subject: [PATCH] patch disguise tags npe

---
 .../main/java/com/denizenscript/denizen/objects/EntityTag.java | 3 +++
 .../main/java/com/denizenscript/denizen/objects/PlayerTag.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
index 78d8508e04..b69a8569a4 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -2484,6 +2484,9 @@ else if (object.getBukkitEntity() instanceof Hanging) {
             if (disguise == null) {
                 return null;
             }
+            if (disguise.toOthers == null) {
+                return null;
+            }
             return disguise.toOthers.entity;
         });
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
index 22c665ce4d..8345496d50 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java
@@ -2311,6 +2311,9 @@ else if (foodLevel / maxHunger < 1) {
             if (disguise == null) {
                 return null;
             }
+            if (disguise.fakeToSelf == null) {
+                return null;
+            }
             return disguise.fakeToSelf.entity;
         });
     }