13
0
geforkt von Mirrors/Paper

[Bleeding] Fixed TNT dropping when it shouldn't. Fixes BUKKIT-1304

Dieser Commit ist enthalten in:
feildmaster 2012-03-25 17:53:24 -05:00 committet von Warren Loo
Ursprung 94d718a146
Commit 0c9b59e071

Datei anzeigen

@ -46,7 +46,7 @@ public class BlockTNT extends Block {
if ((l & 1) == 0) { if ((l & 1) == 0) {
/* CraftBukkit - Move this earlier so the block break event can see it /* 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)); this.a(world, i, j, k, new ItemStack(Block.TNT.id, 1, 0));
// */ */
} else { } else {
EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F)); 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 // CraftBukkit start - Calculate drops
public ArrayList<ItemStack> calculateDrops(World world, EntityHuman entityhuman, int i, int j, int k, int l) { public ArrayList<ItemStack> calculateDrops(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
super.dropList = new ArrayList<ItemStack>(); if ((l & 1) == 0) {
this.a(world, i, j, k, new ItemStack(Block.TNT.id, 1, 0)); this.a(world, i, j, k, new ItemStack(Block.TNT.id, 1, 0));
return super.dropList; }
return this.dropList;
} }
// CraftBukkit end // CraftBukkit end