mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-21 18:15:54 +01: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.
37 lines
2.1 KiB
Diff
37 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
Date: Sun, 29 Sep 2024 16:21:26 +0200
|
|
Subject: [PATCH] Add PlayerInsertLecternBookEvent
|
|
|
|
|
|
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 d7e14ee2c11f34703b63fcd2e2ad5257003e14c8..70f2e6278e2d970245ca5b46fbd9ffae4727b47b 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
|
|
@@ -158,7 +158,24 @@ public class LecternBlock extends BaseEntityBlock {
|
|
BlockEntity tileentity = world.getBlockEntity(pos);
|
|
|
|
if (tileentity instanceof LecternBlockEntity tileentitylectern) {
|
|
- tileentitylectern.setBook(stack.consumeAndReturn(1, user));
|
|
+ // Paper start - Add PlayerInsertLecternBookEvent
|
|
+ ItemStack eventSourcedBookStack = null;
|
|
+ if (user instanceof final net.minecraft.server.level.ServerPlayer serverPlayer) {
|
|
+ final io.papermc.paper.event.player.PlayerInsertLecternBookEvent event = new io.papermc.paper.event.player.PlayerInsertLecternBookEvent(
|
|
+ serverPlayer.getBukkitEntity(),
|
|
+ org.bukkit.craftbukkit.block.CraftBlock.at(world, pos),
|
|
+ org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack.copyWithCount(1))
|
|
+ );
|
|
+ if (!event.callEvent()) return;
|
|
+ eventSourcedBookStack = org.bukkit.craftbukkit.inventory.CraftItemStack.unwrap(event.getBook());
|
|
+ }
|
|
+ if (eventSourcedBookStack == null) {
|
|
+ eventSourcedBookStack = stack.consumeAndReturn(1, user);
|
|
+ } else {
|
|
+ stack.consume(1, user);
|
|
+ }
|
|
+ tileentitylectern.setBook(eventSourcedBookStack);
|
|
+ // Paper end - Add PlayerInsertLecternBookEvent
|
|
LecternBlock.resetBookState(user, world, pos, state, true);
|
|
world.playSound((Player) null, pos, SoundEvents.BOOK_PUT, SoundSource.BLOCKS, 1.0F, 1.0F);
|
|
}
|