OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-12 18:01:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5416: Block.getDrops gives drops even when tool should not give drops

Browse source
This commit is contained in:
md_5 2019-12-08 10:39:57 +11:00
parent 43183eabc2
commit eeae942e44
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View file

@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.block;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import net.minecraft.server.AxisAlignedBB; import net.minecraft.server.AxisAlignedBB;
@ -141,10 +142,6 @@ public class CraftBlock implements Block {
world.setTypeAndData(position, CraftMagicNumbers.getBlock(getType(), data), flag); world.setTypeAndData(position, CraftMagicNumbers.getBlock(getType(), data), flag);
} }
private IBlockData getData0() {
return world.getType(position);
}
@Override @Override
public byte getData() { public byte getData() {
IBlockData blockData = world.getType(position); IBlockData blockData = world.getType(position);
@ -153,7 +150,7 @@ public class CraftBlock implements Block {
@Override @Override
public BlockData getBlockData() { public BlockData getBlockData() {
return CraftBlockData.fromData(getData0()); return CraftBlockData.fromData(getNMS());
} }
@Override @Override
@ -612,8 +609,16 @@ public class CraftBlock implements Block {
@Override @Override
public Collection<ItemStack> getDrops(ItemStack item) { public Collection<ItemStack> getDrops(ItemStack item) {
return net.minecraft.server.Block.getDrops(getNMS(), (WorldServer) world.getMinecraftWorld(), position, world.getTileEntity(position), null, CraftItemStack.asNMSCopy(item)) IBlockData iblockdata = getNMS();
net.minecraft.server.ItemStack nms = CraftItemStack.asNMSCopy(item);
// Modelled off EntityHuman#hasBlock
if (iblockdata.getMaterial().isAlwaysDestroyable() || nms.b(iblockdata)) {
return net.minecraft.server.Block.getDrops(iblockdata, (WorldServer) world.getMinecraftWorld(), position, world.getTileEntity(position), null, nms)
.stream().map(CraftItemStack::asBukkitCopy).collect(Collectors.toList()); .stream().map(CraftItemStack::asBukkitCopy).collect(Collectors.toList());
} else {
return Collections.emptyList();
}
} }
@Override @Override
@ -638,7 +643,7 @@ public class CraftBlock implements Block {
@Override @Override
public boolean isPassable() { public boolean isPassable() {
return this.getData0().getCollisionShape(world, position).isEmpty(); return this.getNMS().getCollisionShape(world, position).isEmpty();
} }
@Override @Override
@ -666,7 +671,7 @@ public class CraftBlock implements Block {
@Override @Override
public BoundingBox getBoundingBox() { public BoundingBox getBoundingBox() {
VoxelShape shape = getData0().getShape(world, position); VoxelShape shape = getNMS().getShape(world, position);
if (shape.isEmpty()) { if (shape.isEmpty()) {
return new BoundingBox(); // Return an empty bounding box if the block has no dimension return new BoundingBox(); // Return an empty bounding box if the block has no dimension