Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
feildmaster
2012-03-23 06:08:54 -05:00
committed by EvilSeph
parent ff22e4e341
commit 40e0962735
11 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minecraft/server/BlockLeaves.java
View File

@@ -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);
}