diff --git a/leaves-server/minecraft-patches/features/0105-Old-Block-remove-behaviour.patch b/leaves-server/minecraft-patches/features/0105-Old-Block-remove-behaviour.patch index 99f6764e..a8bcc63f 100644 --- a/leaves-server/minecraft-patches/features/0105-Old-Block-remove-behaviour.patch +++ b/leaves-server/minecraft-patches/features/0105-Old-Block-remove-behaviour.patch @@ -388,7 +388,7 @@ index 56cf6528f0cd9b8528490d7cee9a1f0e54108ef9..955854e5b3a18b8f1441145554a97c54 protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel level, BlockPos pos, boolean movedByPiston) { Containers.updateNeighboursAfterDestroy(state, level, pos); diff --git a/net/minecraft/world/level/block/LecternBlock.java b/net/minecraft/world/level/block/LecternBlock.java -index 5a9b601b7bf7e80b04ebd8f5c8b7d121031132c7..ee666995db38374193414d24fa38260c855be622 100644 +index 5a9b601b7bf7e80b04ebd8f5c8b7d121031132c7..b714d3c7649384a8fdbe0a713e2193e241c80618 100644 --- a/net/minecraft/world/level/block/LecternBlock.java +++ b/net/minecraft/world/level/block/LecternBlock.java @@ -197,6 +197,36 @@ public class LecternBlock extends BaseEntityBlock { @@ -411,7 +411,7 @@ index 5a9b601b7bf7e80b04ebd8f5c8b7d121031132c7..ee666995db38374193414d24fa38260c + } + + private void popBook(BlockState state, Level level, BlockPos pos) { -+ if (level.getBlockEntity(pos, false) instanceof LecternBlockEntity lecternBlockEntity) { // CraftBukkit - don't validate, type may be changed already ++ if (level.getBlockEntity(pos) instanceof LecternBlockEntity lecternBlockEntity) { // CraftBukkit - don't validate, type may be changed already // Leaves - the method with validate arg already removed by paper... + Direction direction = state.getValue(FACING); + ItemStack itemStack = lecternBlockEntity.getBook().copy(); + if (itemStack.isEmpty()) return; // CraftBukkit - SPIGOT-5500