minor patch

DenizenScript · Apr 13, 2021 · 6e900de · 6e900de
1 parent cf9208d
commit 6e900de
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...in/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java b/...in/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java
@@ -566,6 +566,9 @@ public boolean setSpecialDef(String def, ScriptQueue queue, ObjectTag value) {
                 return true;
             }
             PlayerTag player = value.asType(PlayerTag.class, baseData.getTagContext());
+            if (player == null) {
+                return false;
+            }
             if (queue.getLastEntryExecuted() != null) {
                 ((BukkitScriptEntryData) queue.getLastEntryExecuted().entryData).setPlayer(player);
             }
@@ -580,6 +583,9 @@ else if (def.equals("__npc")) {
                 return true;
             }
             NPCTag npc = value.asType(NPCTag.class, baseData.getTagContext());
+            if (npc == null) {
+                return false;
+            }
             if (queue.getLastEntryExecuted() != null) {
                 ((BukkitScriptEntryData) queue.getLastEntryExecuted().entryData).setNPC(npc);
             }