mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 03:46:28 +00:00
8c5b837e05
Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads.
43 lines
2.7 KiB
Diff
43 lines
2.7 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 properly
|
|
|
|
Call BlockRedstoneEvents for lecterns.
|
|
Fix previous power level for experimental redstone wire.
|
|
|
|
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 44d322d26187bd7528799069d0e08dbf571a57f3..2864d0dec66980736f7434bff3031c05cff64592 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
|
|
@@ -180,6 +180,16 @@ public class LecternBlock extends BaseEntityBlock {
|
|
}
|
|
|
|
private static void changePowered(Level world, BlockPos pos, BlockState state, boolean powered) {
|
|
+ // Paper start - Call BlockRedstoneEvent properly
|
|
+ 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 BlockRedstoneEvent properly
|
|
world.setBlock(pos, (BlockState) state.setValue(LecternBlock.POWERED, powered), 3);
|
|
LecternBlock.updateBelow(world, pos, state);
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java b/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
|
|
index 28e0ff0a6fef63a572782704d34c4ccefc7baec1..bad91f7e9ebcf9d73f2d74a65e5235ee496e844e 100644
|
|
--- a/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
|
|
+++ b/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.java
|
|
@@ -46,7 +46,7 @@ public class ExperimentalRedstoneWireEvaluator extends RedstoneWireEvaluator {
|
|
BlockState iblockdata1 = world.getBlockState(blockposition1);
|
|
|
|
// CraftBukkit start
|
|
- int oldPower = state.getValue(RedStoneWireBlock.POWER);
|
|
+ int oldPower = iblockdata1.getValue(RedStoneWireBlock.POWER); // Paper - Call BlockRedstoneEvent properly; get the previous power from the right state
|
|
if (oldPower != j) {
|
|
BlockRedstoneEvent event = new BlockRedstoneEvent(CraftBlock.at(world, blockposition1), oldPower, j);
|
|
world.getCraftServer().getPluginManager().callEvent(event);
|