fix spawn command on unspawned NPCs

DenizenScript · Dec 13, 2021 · 4b8237d · 4b8237d
1 parent ca58558
commit 4b8237d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 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
@@ -405,7 +405,6 @@ public EntityTag(NPCTag npc) {
         }
         if (npc != null) {
             this.npc = npc;
-
             if (npc.isSpawned()) {
                 this.entity = npc.getEntity();
                 this.entity_type = DenizenEntityType.getByName(npc.getEntityType().name());
@@ -415,7 +414,6 @@ public EntityTag(NPCTag npc) {
         else {
             Debug.echoError("NPC referenced is null!");
         }
-
     }
 
     /////////////////////
@@ -748,9 +746,18 @@ public void spawnAt(Location location) {
                 getDenizenNPC().getCitizen().teleport(location, TeleportCause.PLUGIN);
             }
             else {
-                getDenizenNPC().getCitizen().spawn(location);
-                entity = getDenizenNPC().getCitizen().getEntity();
-                uuid = getDenizenNPC().getCitizen().getEntity().getUniqueId();
+                if (getDenizenNPC().getCitizen().spawn(location)) {
+                    entity = getDenizenNPC().getCitizen().getEntity();
+                    uuid = getDenizenNPC().getCitizen().getEntity().getUniqueId();
+                }
+                else {
+                    if (new LocationTag(location).isChunkLoaded()) {
+                        Debug.echoError("Error spawning NPC - tried to spawn in an unloaded chunk.");
+                    }
+                    else {
+                        Debug.echoError("Error spawning NPC - blocked by plugin");
+                    }
+                }
             }
         }
         else if (isUnique() && entity != null) {
@@ -872,7 +879,12 @@ else if (face == BlockFace.SOUTH) {
                 Debug.echoError("Cannot spawn a null EntityTag!");
             }
             if (!isUnique()) {
-                Debug.echoError("Error spawning entity - bad entity type, blocked by another plugin, or tried to spawn in an unloaded chunk?");
+                if (new LocationTag(location).isChunkLoaded()) {
+                    Debug.echoError("Error spawning entity - tried to spawn in an unloaded chunk.");
+                }
+                else {
+                    Debug.echoError("Error spawning entity - bad entity type, blocked by another plugin?");
+                }
                 return;
             }
             for (Mechanism mechanism : mechanisms) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/CommonRegistries.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/CommonRegistries.java
@@ -237,13 +237,13 @@ public boolean canBecome(ObjectTag inp) {
                 return new EntityTag(((PlayerTag) obj).getPlayerEntity());
             }
             else if (obj instanceof NPCTag) {
-                if (!((NPCTag) obj).isSpawned()) {
+                if (!((NPCTag) obj).isSpawned() && !EntityTag.allowDespawnedNpcs) {
                     if (context.showErrors()) {
                         Debug.echoError("NPC '" + obj.debuggable() + "' is unspawned, cannot convert to EntityTag.");
                     }
                     return null;
                 }
-                return new EntityTag(((NPCTag) obj).getEntity());
+                return new EntityTag((NPCTag) obj);
             }
             return EntityTag.valueOf(obj.toString(), context);
         });