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/org | |
| 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/org')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 1 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 25967d91..602f806f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1056,6 +1056,7 @@ public class CraftWorld implements World { int blockZ = block.getZ(); // following code is lifted from Explosion.a(boolean), and modified net.minecraft.server.Block.byId[blockId].dropNaturally(this.world, blockX, blockY, blockZ, block.getData(), yield, 0); + net.minecraft.server.Block.byId[blockId].doActualDrop(this.world, blockX, blockY, blockZ); block.setType(org.bukkit.Material.AIR); // not sure what this does, seems to have something to do with the 'base' material of a block. // For example, WOODEN_STAIRS does something with WOOD in this method diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index b667b21d..6e89ef4d 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -348,10 +348,7 @@ public class CraftBlock implements Block { setTypeId(Material.AIR.getId()); if (block != null) { - block.dropNaturally(chunk.getHandle().world, x, y, z, data, 1.0F, 0); - for (ItemStack item : getDrops()) { - block.finishDrop(chunk.getHandle().world, x, y, z, CraftItemStack.createNMSItemStack(item)); - } + block.b(chunk.getHandle().world, x, y, z, data, 0); return true; } return false; |