diff options
author | feildmaster <admin@feildmaster.com> | 2012-03-25 17:53:24 -0500 |
---|---|---|
committer | Warren Loo <evilseph@gmail.com> | 2012-03-25 18:57:13 -0400 |
commit | 0c9b59e071194dd737c69809d6f41b22014eeec7 (patch) | |
tree | 48eb4948d67328901e08eb9222595dc3e434ba1e /src/main/java | |
parent | 94d718a1462168280c01ffd439707f7094794460 (diff) | |
download | craftbukkit-0c9b59e071194dd737c69809d6f41b22014eeec7.tar craftbukkit-0c9b59e071194dd737c69809d6f41b22014eeec7.tar.gz craftbukkit-0c9b59e071194dd737c69809d6f41b22014eeec7.tar.lz craftbukkit-0c9b59e071194dd737c69809d6f41b22014eeec7.tar.xz craftbukkit-0c9b59e071194dd737c69809d6f41b22014eeec7.zip |
[Bleeding] Fixed TNT dropping when it shouldn't. Fixes BUKKIT-1304
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockTNT.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java index 96afed97..3aaf8c6d 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -46,7 +46,7 @@ public class BlockTNT extends Block { if ((l & 1) == 0) { /* CraftBukkit - Move this earlier so the block break event can see it this.a(world, i, j, k, new ItemStack(Block.TNT.id, 1, 0)); - // */ + */ } else { EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F)); @@ -58,9 +58,10 @@ public class BlockTNT extends Block { // CraftBukkit start - Calculate drops public ArrayList<ItemStack> calculateDrops(World world, EntityHuman entityhuman, int i, int j, int k, int l) { - super.dropList = new ArrayList<ItemStack>(); - this.a(world, i, j, k, new ItemStack(Block.TNT.id, 1, 0)); - return super.dropList; + if ((l & 1) == 0) { + this.a(world, i, j, k, new ItemStack(Block.TNT.id, 1, 0)); + } + return this.dropList; } // CraftBukkit end |