diff --git a/patches/server/0878-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0877-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0878-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0877-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0877-Fix-CreativeCategory-API.patch b/patches/server/0877-Fix-CreativeCategory-API.patch
deleted file mode 100644
index 6835fb2350..0000000000
--- a/patches/server/0877-Fix-CreativeCategory-API.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 12 Mar 2022 15:19:27 -0800
-Subject: [PATCH] Fix CreativeCategory API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java
-index 0c91897aa532e86e8a37c2359475f5dc0bb6e780..9036c388a1d7fbe7bbb1808d39b6701a6744438d 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java
-@@ -13,7 +13,7 @@ public final class CraftCreativeCategory {
-             .put(CreativeModeTab.TAB_REDSTONE, CreativeCategory.REDSTONE)
-             .put(CreativeModeTab.TAB_TRANSPORTATION, CreativeCategory.TRANSPORTATION)
-             .put(CreativeModeTab.TAB_MISC, CreativeCategory.MISC) // Interchangeable in NMS
--            .put(CreativeModeTab.TAB_MATERIALS, CreativeCategory.MISC) // Interchangeable in NMS
-+            // .put(CreativeModeTab.TAB_MATERIALS, CreativeCategory.MISC) // Interchangeable in NMS // Paper - can't have duplicate keys
-             .put(CreativeModeTab.TAB_FOOD, CreativeCategory.FOOD)
-             .put(CreativeModeTab.TAB_TOOLS, CreativeCategory.TOOLS)
-             .put(CreativeModeTab.TAB_COMBAT, CreativeCategory.COMBAT)
diff --git a/patches/server/0879-Implement-getComputedBiome-API.patch b/patches/server/0878-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0879-Implement-getComputedBiome-API.patch
rename to patches/server/0878-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0880-Make-some-itemstacks-nonnull.patch b/patches/server/0879-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0880-Make-some-itemstacks-nonnull.patch
rename to patches/server/0879-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0881-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0880-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0881-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0880-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0882-Implement-enchantWithLevels-API.patch b/patches/server/0881-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0882-Implement-enchantWithLevels-API.patch
rename to patches/server/0881-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0883-Fix-saving-in-unloadWorld.patch b/patches/server/0882-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0883-Fix-saving-in-unloadWorld.patch
rename to patches/server/0882-Fix-saving-in-unloadWorld.patch
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 953d3ddc67..e9f972d674 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 953d3ddc674e5fc3ef04588f9fdcc35643653463
+Subproject commit e9f972d6744d66460a78a868d298c7f543533073