Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-16 05:11:27 +01:00
Code Issues Projects Releases Wiki Activity

Break redstone on top of trap doors early

Browse Source 
This logic hooks into the neighbour update which should be invoked
as a result of redstone powering the trap door.
This commit is contained in:
Spottedleaf 2023-05-01 18:31:26 -07:00
parent 3079b71627
commit dfe1579715
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
paper-server/patches/sources/net/minecraft/world/level/block/TrapDoorBlock.java.patch
View File

@ -8,10 +8,11 @@
public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleWaterloggedBlock { public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleWaterloggedBlock {
@@ -143,6 +144,19 @@ @@ -143,7 +144,39 @@
boolean flag1 = world.hasNeighborSignal(pos); boolean flag1 = world.hasNeighborSignal(pos);
if (flag1 != (Boolean) state.getValue(TrapDoorBlock.POWERED)) { if (flag1 != (Boolean) state.getValue(TrapDoorBlock.POWERED)) {
- if ((Boolean) state.getValue(TrapDoorBlock.OPEN) != flag1) {
+ // CraftBukkit start + // CraftBukkit start
+ org.bukkit.World bworld = world.getWorld(); + org.bukkit.World bworld = world.getWorld();
+ org.bukkit.block.Block bblock = bworld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()); + org.bukkit.block.Block bblock = bworld.getBlockAt(pos.getX(), pos.getY(), pos.getZ());
@ -25,6 +26,26 @@
+ flag1 = eventRedstone.getNewCurrent() > 0; + flag1 = eventRedstone.getNewCurrent() > 0;
+ } + }
+ // CraftBukkit end + // CraftBukkit end
if ((Boolean) state.getValue(TrapDoorBlock.OPEN) != flag1) { + // Paper start - break redstone on trapdoors early
+ boolean open = (Boolean) state.getValue(TrapDoorBlock.OPEN) != flag1;
+ // note: this must run before any state for this block/its neighborus are written to the world
+ // we allow the redstone event to fire so that plugins can block
+ if (flag1 && open) { // if we are now powered and it caused the trap door to open
+ // in this case, first check for the redstone on top first
+ BlockPos abovePos = pos.above();
+ BlockState above = world.getBlockState(abovePos);
+ if (above.getBlock() instanceof RedStoneWireBlock) {
+ world.setBlock(abovePos, Blocks.AIR.defaultBlockState(), Block.UPDATE_CLIENTS | Block.UPDATE_NEIGHBORS);
+ Block.popResource(world, abovePos, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.REDSTONE));
+ // now check that this didn't change our state
+ if (world.getBlockState(pos) != state) {
+ // our state was changed, so we cannot propagate this update
+ return;
+ }
+ }
+ }
+ if (open) {
+ // Paper end - break redstone on trapdoors early
state = (BlockState) state.setValue(TrapDoorBlock.OPEN, flag1); state = (BlockState) state.setValue(TrapDoorBlock.OPEN, flag1);
this.playSound((Player) null, world, pos, flag1); this.playSound((Player) null, world, pos, flag1);
}