summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-10-28 22:04:45 -0500
committerTravis Watkins <amaranth@ubuntu.com>2012-10-29 02:28:27 -0500
commitd16f8c5e652c61a7d88ff863ea154a64df4fb6c1 (patch)
tree7e6b5377287ff676ded0c126cd4011b1ff809f83 /src/main/java/net/minecraft/server
parentf4cdf8fe98ece2f8f6dbdee907c820434d474412 (diff)
downloadcraftbukkit-d16f8c5e652c61a7d88ff863ea154a64df4fb6c1.tar
craftbukkit-d16f8c5e652c61a7d88ff863ea154a64df4fb6c1.tar.gz
craftbukkit-d16f8c5e652c61a7d88ff863ea154a64df4fb6c1.tar.lz
craftbukkit-d16f8c5e652c61a7d88ff863ea154a64df4fb6c1.tar.xz
craftbukkit-d16f8c5e652c61a7d88ff863ea154a64df4fb6c1.zip
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.
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/BlockSkull.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/BlockSkull.java b/src/main/java/net/minecraft/server/BlockSkull.java
index e7520eac..d6cdd23a 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);
}