xiaoxijun
c07dde1c0b
add cce update suppression & prevent crashes caused by update suppres & dustTrapdoorReintroduced & instantBlockUpdater & old Block remove behaviour & do not reset placed block on exception & do not prevent block entity and entity crash at LevelChunk (#84) * add cce update suppression & prevent crashes caused by update suppression * no need for this transformed flag * Add Redstone ignore upwards update * fix up license * move config * instant Block Updater * feat: Update Suppression! * Leaves: Do not reset placed block on exception & Do not prevent block entity and entity crash at LevelChunk --------- Co-authored-by: Helvetica Volubi <suisuroru@blue-millennium.fun> Co-authored-by: Helvetica Volubi <88063803+Suisuroru@users.noreply.github.com>
50 lines
3.2 KiB
Diff
50 lines
3.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
|
Date: Tue, 18 Nov 2025 00:24:32 +0800
|
|
Subject: [PATCH] Revert TrapDoorBlock changes form paperMC
|
|
|
|
|
|
diff --git a/net/minecraft/world/level/block/TrapDoorBlock.java b/net/minecraft/world/level/block/TrapDoorBlock.java
|
|
index a2140d22dc58aa2df1afbeb5170d04fd65739d55..ea79c471c03b6908710d5943f2ff378eaba4099e 100644
|
|
--- a/net/minecraft/world/level/block/TrapDoorBlock.java
|
|
+++ b/net/minecraft/world/level/block/TrapDoorBlock.java
|
|
@@ -128,37 +128,7 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
|
|
if (!level.isClientSide) {
|
|
boolean hasNeighborSignal = level.hasNeighborSignal(pos);
|
|
if (hasNeighborSignal != state.getValue(POWERED)) {
|
|
- // CraftBukkit start
|
|
- org.bukkit.block.Block bblock = org.bukkit.craftbukkit.block.CraftBlock.at(level, pos);
|
|
- int power = bblock.getBlockPower();
|
|
- int oldPower = state.getValue(TrapDoorBlock.OPEN) ? 15 : 0;
|
|
-
|
|
- if (oldPower == 0 ^ power == 0 || neighborBlock.defaultBlockState().isSignalSource()) {
|
|
- org.bukkit.event.block.BlockRedstoneEvent eventRedstone = new org.bukkit.event.block.BlockRedstoneEvent(bblock, oldPower, power);
|
|
- level.getCraftServer().getPluginManager().callEvent(eventRedstone);
|
|
- hasNeighborSignal = eventRedstone.getNewCurrent() > 0;
|
|
- }
|
|
- // CraftBukkit end
|
|
- // Paper start - break redstone on trapdoors early
|
|
- boolean open = state.getValue(TrapDoorBlock.OPEN) != hasNeighborSignal;
|
|
- // note: this must run before any state for this block/its neighbours are written to the world
|
|
- // we allow the redstone event to fire so that plugins can block
|
|
- if (hasNeighborSignal && 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 = level.getBlockState(abovePos);
|
|
- if (above.getBlock() instanceof RedStoneWireBlock) {
|
|
- level.setBlock(abovePos, Blocks.AIR.defaultBlockState(), Block.UPDATE_CLIENTS | Block.UPDATE_NEIGHBORS);
|
|
- Block.popResource(level, abovePos, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.REDSTONE));
|
|
- // now check that this didn't change our state
|
|
- if (level.getBlockState(pos) != state) {
|
|
- // our state was changed, so we cannot propagate this update
|
|
- return;
|
|
- }
|
|
- }
|
|
- }
|
|
- if (open) {
|
|
- // Paper end - break redstone on trapdoors early
|
|
+ if (state.getValue(OPEN) != hasNeighborSignal) {
|
|
state = state.setValue(OPEN, hasNeighborSignal);
|
|
this.playSound(null, level, pos, hasNeighborSignal);
|
|
}
|