diff --git a/patches/api/Timings-v2.patch b/patches/api/Timings-v2.patch
index 2c95d3a74b..88c7cc9b84 100644
--- a/patches/api/Timings-v2.patch
+++ b/patches/api/Timings-v2.patch
@@ -2837,9 +2837,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      Material fromLegacy(Material material);
 @@ -0,0 +0,0 @@ public interface UnsafeValues {
-     boolean removeAdvancement(NamespacedKey key);
- 
      Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(Material material, EquipmentSlot slot);
+ 
+     CreativeCategory getCreativeCategory(Material material);
 +
 +    // Paper start
 +    /**
diff --git a/patches/server/Timings-v2.patch b/patches/server/Timings-v2.patch
index 9de3f191e0..2ebd053190 100644
--- a/patches/server/Timings-v2.patch
+++ b/patches/server/Timings-v2.patch
@@ -2118,7 +2118,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static byte toLegacyData(BlockState data) {
          return CraftLegacy.toLegacyData(data);
 @@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
-         return defaultAttributes.build();
+         return CraftCreativeCategory.fromNMS(category);
      }
  
 +    // Paper start
diff --git a/work/Bukkit b/work/Bukkit
index d8a3c3b556..e25c6a7552 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit d8a3c3b55674a931391e2905cad4d54acfd15d11
+Subproject commit e25c6a75523b5122f539a5a59dcf0275c3213a5a
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6e755020ab..86292d3e08 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6e755020abbd73dabf2593060b7641fda9b80e71
+Subproject commit 86292d3e084729f53ce77af17b7b20d91754b7a5