spigot-mirror/craftbukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git synced 2025-08-21 05:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unnecessary CraftBlock creation in CraftRegionAccessor#setBlock

Browse source
This commit is contained in:
md_5 2021-11-24 08:16:10 +11:00
parent 03f249f098
commit a11ec5d7f5
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
View file

@ -272,7 +272,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@Override @Override
public void setBlockData(int x, int y, int z, BlockData blockData) { public void setBlockData(int x, int y, int z, BlockData blockData) {
CraftBlock.at(getHandle(), new BlockPosition(x, y, z)).setTypeAndData(((CraftBlockData) blockData).getState(), true); GeneratorAccessSeed world = getHandle();
BlockPosition pos = new BlockPosition(x, y, z);
IBlockData old = getHandle().getBlockState(pos);
CraftBlock.setTypeAndData(world, pos, old, ((CraftBlockData) blockData).getState(), true);
} }
@Override @Override

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

@ -185,8 +185,11 @@ public class CraftBlock implements Block {
setTypeAndData(((CraftBlockData) data).getState(), applyPhysics); setTypeAndData(((CraftBlockData) data).getState(), applyPhysics);
} }
public boolean setTypeAndData(final IBlockData blockData, final boolean applyPhysics) { boolean setTypeAndData(final IBlockData blockData, final boolean applyPhysics) {
IBlockData old = getNMS(); return setTypeAndData(world, position, getNMS(), blockData, applyPhysics);
}
public static boolean setTypeAndData(GeneratorAccess world, BlockPosition position, IBlockData old, IBlockData blockData, 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 (old.hasBlockEntity() && blockData.getBlock() != old.getBlock()) { // SPIGOT-3725 remove old tile entity if block changes if (old.hasBlockEntity() && blockData.getBlock() != old.getBlock()) { // SPIGOT-3725 remove old tile entity if block changes
// SPIGOT-4612: faster - just clear tile // SPIGOT-4612: faster - just clear tile