Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SPIGOT-5751: Made breakNaturally and getDrops returns the correct item if no argument is given

This commit is contained in:
Lars Dormans 2020-06-03 19:28:13 +10:00 committed by md_5
parent 1b2830a3b3
commit 8637ec008d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View File

@ -587,7 +587,7 @@ public class CraftBlock implements Block {
@Override
public boolean breakNaturally() {
return breakNaturally(new ItemStack(Material.AIR));
return breakNaturally(null);
}
@Override
@ -599,7 +599,7 @@ public class CraftBlock implements Block {
boolean result = false;
// Modelled off EntityHuman#hasBlock
if (block != Blocks.AIR && (iblockdata.getMaterial().isAlwaysDestroyable() || nmsItem.canDestroySpecialBlock(iblockdata))) {
if (block != Blocks.AIR && (item == null || iblockdata.getMaterial().isAlwaysDestroyable() || nmsItem.canDestroySpecialBlock(iblockdata))) {
net.minecraft.server.Block.dropItems(iblockdata, world.getMinecraftWorld(), position, world.getTileEntity(position), null, nmsItem);
result = true;
}
@ -609,7 +609,7 @@ public class CraftBlock implements Block {
@Override
public Collection<ItemStack> getDrops() {
return getDrops(new ItemStack(Material.AIR));
return getDrops(null);
}
@Override
@ -623,7 +623,7 @@ public class CraftBlock implements Block {
net.minecraft.server.ItemStack nms = CraftItemStack.asNMSCopy(item);
// Modelled off EntityHuman#hasBlock
if (iblockdata.getMaterial().isAlwaysDestroyable() || nms.canDestroySpecialBlock(iblockdata)) {
if (item == null || iblockdata.getMaterial().isAlwaysDestroyable() || nms.canDestroySpecialBlock(iblockdata)) {
return net.minecraft.server.Block.getDrops(iblockdata, (WorldServer) world.getMinecraftWorld(), position, world.getTileEntity(position), entity == null ? null : ((CraftEntity) entity).getHandle(), nms)
.stream().map(CraftItemStack::asBukkitCopy).collect(Collectors.toList());
} else {