mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
[Bleeding] Fixed TNT dropping when it shouldn't. Fixes BUKKIT-1304
This commit is contained in:
parent
94d718a146
commit
0c9b59e071
1 changed files with 5 additions and 4 deletions
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue