Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-26 10:57:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix Block.setType alone being treated as legacy

Browse Source
This commit is contained in:
md_5 2018-07-18 16:59:41 +10:00
parent d48ecdeb45
commit 9c98002856
1 changed files with 2 additions and 6 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

@ -130,7 +130,7 @@ public class CraftBlock implements Block {
@Override @Override
public void setType(Material type, boolean applyPhysics) { public void setType(Material type, boolean applyPhysics) {
setTypeAndData(type, (byte) 0, applyPhysics); setBlockData(type.createBlockData(), applyPhysics);
} }
@Override @Override
@ -143,10 +143,6 @@ public class CraftBlock implements Block {
setTypeAndData(((CraftBlockData) data).getState(), applyPhysics); setTypeAndData(((CraftBlockData) data).getState(), applyPhysics);
} }
public boolean setTypeAndData(final Material type, final byte data, final boolean applyPhysics) {
return setTypeAndData(CraftMagicNumbers.getBlock(type, data), applyPhysics);
}
public boolean setTypeAndData(final IBlockData blockData, final boolean applyPhysics) { public boolean setTypeAndData(final IBlockData blockData, final boolean applyPhysics) {
// SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup // SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup
if (!blockData.isAir() && blockData.getBlock() instanceof BlockTileEntity && blockData.getBlock() != getNMSBlock()) { if (!blockData.isAir() && blockData.getBlock() instanceof BlockTileEntity && blockData.getBlock() != getNMSBlock()) {
@ -529,7 +525,7 @@ public class CraftBlock implements Block {
if (itemCausesDrops(item)) { if (itemCausesDrops(item)) {
return breakNaturally(); return breakNaturally();
} else { } else {
return setTypeAndData(Material.AIR, (byte) 0, true); return setTypeAndData(Blocks.AIR.getBlockData(), true);
} }
} }