diff options
author | feildmaster <admin@feildmaster.com> | 2012-03-23 06:08:54 -0500 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-03-23 07:18:20 -0400 |
commit | 40e096273576ec5f0f49490f3167095d8678cbd8 (patch) | |
tree | 8b322b89c49f47ac5156ee3968444683328c3634 /src/main/java/net/minecraft/server/BlockLeaves.java | |
parent | ff22e4e3419b0bef85b6cf0e8cefe27711fc27ff (diff) | |
download | craftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.tar craftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.tar.gz craftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.tar.lz craftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.tar.xz craftbukkit-40e096273576ec5f0f49490f3167095d8678cbd8.zip |
Seriously fix natural drops. Fixes BUKKIT-1297 and fixes BUKKIT-1295
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockLeaves.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockLeaves.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockLeaves.java b/src/main/java/net/minecraft/server/BlockLeaves.java index 686f0f89..6345fafc 100644 --- a/src/main/java/net/minecraft/server/BlockLeaves.java +++ b/src/main/java/net/minecraft/server/BlockLeaves.java @@ -165,7 +165,7 @@ public class BlockLeaves extends BlockTransparant { /* CraftBukkit start - moved this line into calculateDrops this.a(world, i, j, k, new ItemStack(Block.LEAVES.id, 1, l & 3)); */ - this.doActualDrop(world, entityhuman, i, j, k, l); + this.doActualDrop(world, i, j, k); // CraftBukkit end } else { super.a(world, entityhuman, i, j, k, l); @@ -175,9 +175,8 @@ public class BlockLeaves extends BlockTransparant { // CraftBukkit start - Calculate drops public ArrayList<ItemStack> calculateDrops(World world, EntityHuman entityhuman, int i, int j, int k, int l) { if (!world.isStatic && entityhuman.U() != null && entityhuman.U().id == Item.SHEARS.id) { - super.dropList = new ArrayList<ItemStack>(); this.a(world, i, j, k, new ItemStack(Block.LEAVES.id, 1, l & 3)); - return super.dropList; + return this.dropList; } else { return super.calculateDrops(world, entityhuman, i, j, k, l); } |