diff options
| author | feildmaster <admin@feildmaster.com> | 2012-03-23 09:49:34 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-03-23 14:51:05 -0400 |
| commit | 9c7ffb6d3c3ce37dc96e679cb2a30a5ed76f1257 (patch) | |
| tree | 72f872181c493ed24e49583116f26d1a3766432c /src | |
| parent | 942c1c6a3ec8a89f06f65fc9934b61f623e90f4c (diff) | |
| download | craftbukkit-9c7ffb6d3c3ce37dc96e679cb2a30a5ed76f1257.tar craftbukkit-9c7ffb6d3c3ce37dc96e679cb2a30a5ed76f1257.tar.gz craftbukkit-9c7ffb6d3c3ce37dc96e679cb2a30a5ed76f1257.tar.lz craftbukkit-9c7ffb6d3c3ce37dc96e679cb2a30a5ed76f1257.tar.xz craftbukkit-9c7ffb6d3c3ce37dc96e679cb2a30a5ed76f1257.zip | |
[Bleeding] Fixed blocks dropping when BlockBreakEvent is canceled. Fixes BUKKIT-1299
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/Block.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java index 805caf90..7b3962a7 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -564,7 +564,7 @@ public class Block { } else { int i1 = EnchantmentManager.getBonusBlockLootEnchantmentLevel(entityhuman.inventory); - this.b(world, i, j, k, l, i1); + this.dropNaturally(world, i, j, k, l, 1.0F, i1); // CraftBukkit } return this.dropList; // CraftBukkit } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index f4b2cb94..39f01117 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -539,6 +539,7 @@ public class CraftEventFactory { world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { + blockType.setDrops(new ArrayList<ItemStack>()); // Let the client know the block still exists ((EntityPlayer) player).netServerHandler.sendPacket(new Packet53BlockChange(x, y, z, world)); return true; |