From d16f8c5e652c61a7d88ff863ea154a64df4fb6c1 Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Sun, 28 Oct 2012 22:04:45 -0500 Subject: [PATCH] Drop skulls like every other block. Fixes BUKKIT-2678 Instead of having a special case for skulls just use the normal logic for breaking a block. This avoids issues when interacting with API. --- src/main/java/net/minecraft/server/BlockSkull.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/BlockSkull.java b/src/main/java/net/minecraft/server/BlockSkull.java index e7520eac3d..d6cdd23ab8 100644 --- a/src/main/java/net/minecraft/server/BlockSkull.java +++ b/src/main/java/net/minecraft/server/BlockSkull.java @@ -78,7 +78,8 @@ public class BlockSkull extends BlockContainer { return i; } - public void dropNaturally(World world, int i, int j, int k, int l, float f, int i1) {} + // CraftBukkit - drop the item like every other block + // public void dropNaturally(World world, int i, int j, int k, int l, float f, int i1) {} public void a(World world, int i, int j, int k, int l, EntityHuman entityhuman) { if (entityhuman.abilities.canInstantlyBuild) { @@ -91,9 +92,11 @@ public class BlockSkull extends BlockContainer { public void remove(World world, int i, int j, int k, int l, int i1) { if (!world.isStatic) { + /* CraftBukkit start - don't special code dropping the item if ((i1 & 8) == 0) { this.a(world, i, j, k, new ItemStack(Item.SKULL.id, 1, this.getDropData(world, i, j, k))); } + // CraftBukkit end */ super.remove(world, i, j, k, l, i1); }