From 0c9b59e071194dd737c69809d6f41b22014eeec7 Mon Sep 17 00:00:00 2001 From: feildmaster Date: Sun, 25 Mar 2012 17:53:24 -0500 Subject: [PATCH] [Bleeding] Fixed TNT dropping when it shouldn't. Fixes BUKKIT-1304 --- src/main/java/net/minecraft/server/BlockTNT.java | 9 +++++---- 1 file 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 96afed9713..3aaf8c6d98 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 calculateDrops(World world, EntityHuman entityhuman, int i, int j, int k, int l) { - super.dropList = new ArrayList(); - 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