fix "spawn npc" showing unhelpful error

DenizenScript · Sep 3, 2021 · 7ec9330 · 7ec9330
1 parent 9a3c094
commit 7ec9330
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/...c/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java b/...c/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java
@@ -25,6 +25,8 @@ public class PlayerItemTakesDamageScriptEvent extends BukkitScriptEvent implemen
     //
     // @Regex ^on player [^\s]+ takes damage$
     //
+    // @Synonyms item durability changes
+    //
     // @Group Player
     //
     // @Location true

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -169,6 +169,8 @@ public static EntityTag valueOf(String string) {
         return valueOf(string, null);
     }
 
+    public static boolean allowDespawnedNpcs = false;
+
     @Fetchable("e")
     public static EntityTag valueOf(String string, TagContext context) {
         if (string == null) {
@@ -215,7 +217,7 @@ public static EntityTag valueOf(String string, TagContext context) {
                     return new EntityTag(npc);
                 }
                 else {
-                    if (context != null && context.showErrors()) {
+                    if (!allowDespawnedNpcs && context != null && context.showErrors()) {
                         Debug.echoDebug(context.entry, "NPC '" + string + "' is not spawned, errors may follow!");
                     }
                     return new EntityTag(npc);

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java
@@ -76,7 +76,9 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
         for (Argument arg : scriptEntry.getProcessedArgs()) {
             if (!scriptEntry.hasObject("entities")
                     && arg.matchesArgumentList(EntityTag.class)) {
+                EntityTag.allowDespawnedNpcs = true;
                 scriptEntry.addObject("entities", arg.asType(ListTag.class).filter(EntityTag.class, scriptEntry));
+                EntityTag.allowDespawnedNpcs = false;
             }
             else if (!scriptEntry.hasObject("location")
                     && arg.matchesArgumentType(LocationTag.class)) {