add an extra null check to entitytag.owner

DenizenScript · Oct 4, 2021 · 5e42b3e · 5e42b3e
1 parent c36332a
commit 5e42b3e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java
@@ -92,7 +92,11 @@ public ObjectTag getObjectAttribute(Attribute attribute) {
         // -->
         if (attribute.startsWith("owner") || attribute.startsWith("get_owner")) {
             if (((Tameable) entity.getBukkitEntity()).isTamed()) {
-                return new PlayerTag((OfflinePlayer) ((Tameable) entity.getBukkitEntity()).getOwner())
+                OfflinePlayer tamer = (OfflinePlayer) ((Tameable) entity.getBukkitEntity()).getOwner();
+                if (tamer == null) {
+                    return null;
+                }
+                return new PlayerTag(tamer)
                         .getObjectAttribute(attribute.fulfill(1));
             }
             else {