From 68959625dbadb4632c2b0498ff535c0599334705 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Fri, 7 May 2021 11:39:40 -0700 Subject: [PATCH] fix entityitem property error for endermen --- .../denizen/objects/properties/entity/EntityItem.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java index 5b7ddd7a45..a758fe9f87 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityItem.java @@ -10,6 +10,7 @@ import com.denizenscript.denizencore.tags.Attribute; import net.citizensnpcs.api.npc.NPC; import org.bukkit.Material; +import org.bukkit.block.data.BlockData; import org.bukkit.entity.Enderman; import org.bukkit.entity.EntityType; import org.bukkit.entity.Item; @@ -65,10 +66,11 @@ else if (item.getBukkitEntityType() == EntityType.TRIDENT) { return new ItemTag(NMSHandler.getEntityHelper().getItemFromTrident(item.getBukkitEntity())); } else if (item.getBukkitEntity() instanceof Enderman) { - Material mat = ((Enderman) item.getBukkitEntity()).getCarriedBlock().getMaterial(); - if (mat == null) { - mat = Material.AIR; + BlockData data = ((Enderman) item.getBukkitEntity()).getCarriedBlock(); + if (data == null) { + return new ItemTag(Material.AIR); } + Material mat = data.getMaterial(); return new ItemTag(mat); } else if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_15) && item.getBukkitEntity() instanceof ThrowableProjectile) {