Seriously fix natural drops. Fixes BUKKIT-1297 and fixes BUKKIT-1295

1 files changed, 2 insertions, 3 deletions

diff --git a/src/main/java/net/minecraft/server/BlockDeadBush.java b/src/main/java/net/minecraft/server/BlockDeadBush.java
index 7486f92e..60f53b88 100644
--- a/src/main/java/net/minecraft/server/BlockDeadBush.java
+++ b/src/main/java/net/minecraft/server/BlockDeadBush.java
@@ -30,7 +30,7 @@ public class BlockDeadBush extends BlockFlower {
             /* CraftBukkit start - moved this line into calculateDrops
             this.a(world, i, j, k, new ItemStack(Block.DEAD_BUSH, 1, l));
             */
-            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);
@@ -40,9 +40,8 @@ public class BlockDeadBush extends BlockFlower {
     // 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.DEAD_BUSH, 1, l));
-            return super.dropList;
+            return this.dropList;
         } else {
             return super.calculateDrops(world, entityhuman, i, j, k, l);
         }