From d01eeaaf1d6279dc3a1c8b884d30acbe099934de Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Tue, 21 Sep 2021 05:22:20 -0700 Subject: [PATCH] is_player: nonspawned entity support --- .../java/com/denizenscript/denizen/objects/EntityTag.java | 5 ++++- 1 file changed, 4 insertions(+), 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 index 52c1b98b56..fd1055dca3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java @@ -598,6 +598,9 @@ public PlayerTag getDenizenPlayer() { } public boolean isPlayer() { + if (entity == null) { + return entity_type.getBukkitEntityType() == EntityType.PLAYER && npc == null; + } return entity instanceof Player && !isNPC(); } @@ -2271,7 +2274,7 @@ else if (object.getBukkitEntity() instanceof Hanging) { // Returns whether the entity is a player. // Works with offline players. // --> - registerSpawnedOnlyTag("is_player", (attribute, object) -> { + registerTag("is_player", (attribute, object) -> { return new ElementTag(object.isPlayer()); });