diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java index 5c348f0e4a..09c50b1ee1 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java +++ b/plugin/src/main/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); }