diff --git a/patches/server/0888-Fix-lectern-quick-move.patch b/patches/server/0888-Fix-lectern-quick-move.patch
deleted file mode 100644
index ef55c38454..0000000000
--- a/patches/server/0888-Fix-lectern-quick-move.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Raneri <kevin.raneri@gmail.com>
-Date: Sat, 2 Apr 2022 02:12:13 -0400
-Subject: [PATCH] Fix lectern quick move
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/LecternMenu.java b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-index ff79925bc6437222f9ceb133e21bbc0600cc74ed..e5498a5703f282160b8171a0b81711cfc24d323a 100644
---- a/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
-@@ -120,6 +120,13 @@ public class LecternMenu extends AbstractContainerMenu {
-         }
-     }
- 
-+    // Paper start
-+    @Override
-+    public ItemStack quickMoveStack(net.minecraft.world.entity.player.Player player, int index) {
-+        return ItemStack.EMPTY;
-+    }
-+    // Paper end
-+
-     @Override
-     public void setData(int id, int value) {
-         super.setData(id, value);
diff --git a/patches/server/0889-cache-resource-keys.patch b/patches/server/0888-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0889-cache-resource-keys.patch
rename to patches/server/0888-cache-resource-keys.patch
diff --git a/patches/server/0890-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0889-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0890-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0889-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0891-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0890-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0891-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0890-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 10922194f4..2542945ef4 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 10922194f43009dea660c8b5c9fe27f136e940a6
+Subproject commit 2542945ef49093f6e1041dd817d6f640b7fc25b5