improve isPlayerHead

xGinko · Aug 8, 2024 · f9dfc14 · f9dfc14
1 parent e21a5ce
commit f9dfc14
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/shared/src/main/java/me/xginko/aef/utils/MaterialUtil.java b/shared/src/main/java/me/xginko/aef/utils/MaterialUtil.java
@@ -47,14 +47,30 @@ public static boolean isPlayerHead(BlockState blockState) {
         return skull.getSkullType() == SkullType.PLAYER || skull.hasOwner();
     }
 
+    @SuppressWarnings("deprecation")
     public static boolean isPlayerHead(ItemStack itemStack) {
-        if (!PLAYER_HEADS.contains(itemStack.getType()))
+        if (!PLAYER_HEADS.contains(itemStack.getType())) {
             return false;
-        if (PlatformUtil.getMinecraftVersion() > 12)
+        }
+
+        if (PlatformUtil.getMinecraftVersion() > 12) {
+            return true; // Player heads have their own Material enum post 1.12.2
+        }
+
+        if (!itemStack.hasItemMeta()) {
+            return false;
+        }
+
+        if (((SkullMeta) itemStack.getItemMeta()).hasOwner()) {
             return true;
-        // Legacy sums entity heads and player heads into one type: skull.
-        // therefore we need to make sure this is not an entity's head
-        return ((SkullMeta) itemStack.getItemMeta()).hasOwner();
+        }
+
+        if (itemStack.getItemMeta() instanceof BlockStateMeta) {
+            BlockStateMeta blockStateMeta = (BlockStateMeta) itemStack.getItemMeta();
+            return blockStateMeta.hasBlockState() && ((Skull) blockStateMeta.getBlockState()).getSkullType() == SkullType.PLAYER;
+        }
+
+        return false;
     }
 
     public static final Set<Material> SLAB_LIKE = Stream.concat(