remove despawned npcs properly

DenizenScript · Jan 18, 2022 · 6ea919c · 6ea919c
1 parent e4fcb29
commit 6ea919c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java
@@ -1226,7 +1226,7 @@ public String toString() {
 
     @Override
     public boolean isUnique() {
-        return entity != null || uuid != null || isFake;
+        return entity != null || uuid != null || isFake || npc != null;
     }
 
     public LocationTag doLocationTag(Attribute attribute) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java
@@ -62,7 +62,9 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
         for (Argument arg : scriptEntry) {
             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("world")
                     && arg.matchesArgumentType(WorldTag.class)) {