patch disguise tags npe

DenizenScript · Jan 16, 2021 · b28f08d · b28f08d
1 parent 91ac1fa
commit b28f08d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -2311,6 +2311,9 @@ else if (foodLevel / maxHunger < 1) {
             if (disguise == null) {
                 return null;
             }
+            if (disguise.fakeToSelf == null) {
+                return null;
+            }
             return disguise.fakeToSelf.entity;
         });
     }