1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/ItemInWorldManager.java b/src/main/java/net/minecraft/server/ItemInWorldManager.java
index 389a3ed9..771c05f0 100644
--- a/src/main/java/net/minecraft/server/ItemInWorldManager.java
+++ b/src/main/java/net/minecraft/server/ItemInWorldManager.java
@@ -290,9 +290,11 @@ public class ItemInWorldManager {
             int l = this.world.getTypeId(i, j, k);
             if (Block.byId[l] == null) return false; // CraftBukkit - a plugin set block to air without cancelling
             int i1 = this.world.getData(i, j, k);
+
             // CraftBukkit start - special case skulls, their item data comes from a tile entity
-            if (l == Block.SKULL.id) {
-                i1 = Block.SKULL.getDropData(world, i, j, k);
+            if (l == Block.SKULL.id && !this.isCreative()) {
+                Block.SKULL.dropNaturally(world, i, j, k, i1, 1.0F, 0);
+                return this.d(i, j, k);
             }
             // CraftBukkit end