From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cryptite Date: Mon, 10 Apr 2023 07:29:11 -0500 Subject: [PATCH] Set BlockData without light updates diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java index 5ece375eaf6bcc61864997a389bb5e24625e4505..2d61315c9ab87a216e235f1586618b11511b2620 100644 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java @@ -256,7 +256,7 @@ public class WorldGenRegion implements WorldGenLevel { Block.dropResources(iblockdata, this.level, pos, tileentity, breakingEntity, ItemStack.EMPTY); } - return this.setBlock(pos, Blocks.AIR.defaultBlockState(), 3, maxUpdateDepth); + return this.setBlock(pos, Blocks.AIR.defaultBlockState(), 3, maxUpdateDepth, true); // Slice } } @@ -331,7 +331,7 @@ public class WorldGenRegion implements WorldGenLevel { } @Override - public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) { + public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, boolean checkLight) { // Slice if (!this.ensureCanWrite(pos)) { return false; } else { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java index 0c1d7265dee638642f7c868e2f988af7b59e6d7e..e6690b38eb09cd925f9cc2a9b431745e95160fa5 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -906,12 +906,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } @Override - public final boolean setBlock(BlockPos pos, BlockState state, int flags) { // Paper - final for inline - return this.setBlock(pos, state, flags, 512); + public final boolean setBlock(BlockPos pos, BlockState state, int flags, boolean checkLight) { // Paper - final for inline + return this.setBlock(pos, state, flags, 512, checkLight); } @Override - public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) { + public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, boolean checkLight) { // CraftBukkit start - tree generation if (this.captureTreeGeneration) { // Paper start @@ -1107,7 +1107,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { iblockdata.getBlock().popExperience((ServerLevel) this, pos, xp, breakingEntity); // Paper - Properly handle xp dropping; custom amount } - boolean flag1 = this.setBlock(pos, fluid.createLegacyBlock(), 3, maxUpdateDepth); + boolean flag1 = this.setBlock(pos, fluid.createLegacyBlock(), 3, maxUpdateDepth, true); if (flag1) { this.gameEvent(GameEvent.BLOCK_DESTROY, pos, GameEvent.Context.of(breakingEntity, iblockdata)); diff --git a/src/main/java/net/minecraft/world/level/LevelWriter.java b/src/main/java/net/minecraft/world/level/LevelWriter.java index 134e5ec79bf2dddd4e31930f8a7cb2c02fa29518..fd72d278a2719911a46b6bc9e7da2dc24bbe681e 100644 --- a/src/main/java/net/minecraft/world/level/LevelWriter.java +++ b/src/main/java/net/minecraft/world/level/LevelWriter.java @@ -7,10 +7,14 @@ import net.minecraft.world.level.block.state.BlockState; public interface LevelWriter { - boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth); + boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, boolean checkLight); default boolean setBlock(BlockPos pos, BlockState state, int flags) { - return this.setBlock(pos, state, flags, 512); + return this.setBlock(pos, state, flags, 512, true); + } + + default boolean setBlock(BlockPos pos, BlockState state, int flags, boolean checkLight) { + return this.setBlock(pos, state, flags, 512, checkLight); } boolean removeBlock(BlockPos pos, boolean move); diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java index 73d6f881a7d4d8ff96040d34ac502e5b0937d577..f9f147861359258c02fd5f99008a3ab8a6e466c0 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -201,7 +201,7 @@ public class Block extends BlockBehaviour implements ItemLike { world.destroyBlock(pos, (flags & 32) == 0, (Entity) null, maxUpdateDepth); } } else { - world.setBlock(pos, newState, flags & -33, maxUpdateDepth); + world.setBlock(pos, newState, flags & -33, maxUpdateDepth, true); // Slice } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java index 99b890e8650356fc059a89a4164ca3f9a80f9d1f..3b42df7ee3abeb2f06446cc1eb9fe80cf50f3508 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -142,7 +142,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { BlockPos pos = new BlockPos(x, y, z); net.minecraft.world.level.block.state.BlockState old = this.getHandle().getBlockState(pos); - CraftBlock.setTypeAndData(world, pos, old, ((CraftBlockData) blockData).getState(), true); + CraftBlock.setTypeAndData(world, pos, old, ((CraftBlockData) blockData).getState(), true, true); } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index 4b42ef2a876ea210d948238e63fd7a2b7035bb5b..7cdd76f87a10529df5b9476bd2728eb8db9448b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -183,15 +183,20 @@ public class CraftBlock implements Block { @Override public void setBlockData(BlockData data, boolean applyPhysics) { + setBlockData(data, applyPhysics, true); + } + + @Override + public void setBlockData(BlockData data, boolean applyPhysics, boolean checkLight) { Preconditions.checkArgument(data != null, "BlockData cannot be null"); - this.setTypeAndData(((CraftBlockData) data).getState(), applyPhysics); + this.setTypeAndData(((CraftBlockData) data).getState(), applyPhysics, checkLight); } - boolean setTypeAndData(final net.minecraft.world.level.block.state.BlockState blockData, final boolean applyPhysics) { - return CraftBlock.setTypeAndData(this.world, this.position, this.getNMS(), blockData, applyPhysics); + boolean setTypeAndData(final net.minecraft.world.level.block.state.BlockState blockData, final boolean applyPhysics, boolean checkLight) { + return CraftBlock.setTypeAndData(this.world, this.position, this.getNMS(), blockData, applyPhysics, checkLight); } - public static boolean setTypeAndData(LevelAccessor world, BlockPos position, net.minecraft.world.level.block.state.BlockState old, net.minecraft.world.level.block.state.BlockState blockData, boolean applyPhysics) { + public static boolean setTypeAndData(LevelAccessor world, BlockPos position, net.minecraft.world.level.block.state.BlockState old, net.minecraft.world.level.block.state.BlockState blockData, boolean applyPhysics, boolean checkLight) { // 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 // SPIGOT-4612: faster - just clear tile @@ -205,7 +210,7 @@ public class CraftBlock implements Block { if (applyPhysics) { return world.setBlock(position, blockData, 3); } else { - boolean success = world.setBlock(position, blockData, 2 | 16 | 1024); // NOTIFY | NO_OBSERVER | NO_PLACE (custom) + boolean success = world.setBlock(position, blockData, 2 | 16 | 1024, checkLight); // NOTIFY | NO_OBSERVER | NO_PLACE (custom) if (success && world instanceof net.minecraft.world.level.Level) { world.getMinecraftWorld().sendBlockUpdated( position, diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java index d11d854ae90b99aa2ce227994d07fe1fe9b4a60a..1989d8755b422095b3d1ff9a07adf1bc582d5abf 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java @@ -217,7 +217,7 @@ public class CraftBlockState implements BlockState { } net.minecraft.world.level.block.state.BlockState newBlock = this.data; - block.setTypeAndData(newBlock, applyPhysics); + block.setTypeAndData(newBlock, applyPhysics, true); if (access instanceof net.minecraft.world.level.Level) { this.world.getHandle().sendBlockUpdated( this.position, diff --git a/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java index 86a20c91beff6b27e6ec886e49ba902b216106f2..42cd06f0166755cbce19d2dd2d8dcbf297cbcfb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java +++ b/src/main/java/org/bukkit/craftbukkit/util/DelegatedGeneratorAccess.java @@ -803,8 +803,8 @@ public abstract class DelegatedGeneratorAccess implements WorldGenLevel { } @Override - public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) { - return this.handle.setBlock(pos, state, flags, maxUpdateDepth); + public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, boolean checkLight) { + return this.handle.setBlock(pos, state, flags, maxUpdateDepth, checkLight); } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java index a5e34c25e00e7f770bcb6e15ed0bbfe8f369a68a..572e52c494ead11d0fa84cf324f2c86215cc3adb 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java @@ -245,7 +245,7 @@ public class DummyGeneratorAccess implements WorldGenLevel { } @Override - public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) { + public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, boolean checkLight) { return false; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/TransformerGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/TransformerGeneratorAccess.java index 7482dfe64458320d44089c0778591694202e9f70..2f4cde7a89fd47d5f4739bfda9b3033a57898928 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/TransformerGeneratorAccess.java +++ b/src/main/java/org/bukkit/craftbukkit/util/TransformerGeneratorAccess.java @@ -57,14 +57,14 @@ public class TransformerGeneratorAccess extends DelegatedGeneratorAccess { // } // Paper end - Don't fire sync event during generation; don't override these methods - public boolean setCraftBlock(BlockPos position, CraftBlockState craftBlockState, int i, int j) { + public boolean setCraftBlock(BlockPos position, CraftBlockState craftBlockState, int i, int j, boolean checkLight) { if (this.structureTransformer != null) { craftBlockState = this.structureTransformer.transformCraftState(craftBlockState); } // This code is based on the method 'net.minecraft.world.level.levelgen.structure.StructurePiece#placeBlock' // It ensures that any kind of block is updated correctly upon placing it BlockState iblockdata = craftBlockState.getHandle(); - boolean result = super.setBlock(position, iblockdata, i, j); + boolean result = super.setBlock(position, iblockdata, i, j, checkLight); FluidState fluid = this.getFluidState(position); if (!fluid.isEmpty()) { this.scheduleTick(position, fluid.getType(), 0); @@ -80,19 +80,19 @@ public class TransformerGeneratorAccess extends DelegatedGeneratorAccess { } public boolean setCraftBlock(BlockPos position, CraftBlockState craftBlockState, int i) { - return this.setCraftBlock(position, craftBlockState, i, 512); + return this.setCraftBlock(position, craftBlockState, i, 512, true); } @Override - public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) { + public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth, boolean checkLight) { if (this.structureTransformer == null || !this.structureTransformer.canTransformBlocks()) { - return super.setBlock(pos, state, flags, maxUpdateDepth); + return super.setBlock(pos, state, flags, maxUpdateDepth, checkLight); } - return this.setCraftBlock(pos, (CraftBlockState) CraftBlockStates.getBlockState(pos, state, null), flags, maxUpdateDepth); + return this.setCraftBlock(pos, (CraftBlockState) CraftBlockStates.getBlockState(pos, state, null), flags, maxUpdateDepth, checkLight); } @Override - public boolean setBlock(BlockPos pos, BlockState state, int flags) { - return this.setBlock(pos, state, flags, 512); + public boolean setBlock(BlockPos pos, BlockState state, int flags, boolean checkLight) { + return this.setBlock(pos, state, flags, 512, checkLight); } }