Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
e3c8a8eef1
* Add PlayerInsertLecternBookEvent * Rebase Additionally, moves the event call higher up and removes the lectern block state clone from the event. * jSpecify * Shrink correctly * style fixups * move methods * rename param to cancel * fix javadocs * more javadoc fixes * fix co-author on patch from yesterday * last fix --------- Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com> Co-authored-by: Bjarne Koll <lynxplay101@gmail.com>
37 Zeilen
2.1 KiB
Diff
37 Zeilen
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 ebb79907391fe3128d3d16fbe9d8cb0b22bcc9f7..3a1e2f62b297f384cc0dcfb828e523a37c703d6f 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/LecternBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/LecternBlock.java
|
|
@@ -157,7 +157,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);
|
|
}
|