mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 10:35:38 +01:00
dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
28 lines
1.5 KiB
Diff
28 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
|
|
Date: Wed, 13 Sep 2023 05:46:10 +0200
|
|
Subject: [PATCH] Call BlockRedstoneEvents for lecterns
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/LecternBlock.java b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
|
|
index 5ff1e755301336a4e6ec6757510d0c595eacd7a6..f420989056c5c86c94333361f1733fd4b7488283 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
|
|
@@ -179,6 +179,16 @@ public class LecternBlock extends BaseEntityBlock {
|
|
}
|
|
|
|
private static void changePowered(Level world, BlockPos pos, BlockState state, boolean powered) {
|
|
+ // Paper start - call BlockRedstoneEvents for lecterns
|
|
+ final int currentRedstoneLevel = state.getValue(LecternBlock.POWERED) ? 15 : 0, targetRedstoneLevel = powered ? 15 : 0;
|
|
+ if (currentRedstoneLevel != targetRedstoneLevel) {
|
|
+ final org.bukkit.event.block.BlockRedstoneEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, pos, currentRedstoneLevel, targetRedstoneLevel);
|
|
+
|
|
+ if (event.getNewCurrent() != targetRedstoneLevel) {
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ // Paper end - call BlockRedstoneEvents for lecterns
|
|
world.setBlock(pos, (BlockState) state.setValue(LecternBlock.POWERED, powered), 3);
|
|
LecternBlock.updateBelow(world, pos, state);
|
|
}
|