diff --git a/Spigot-API-Patches/LootTable-API.patch b/Spigot-API-Patches/LootTable-API.patch
index 26e3f8397a..32bf01cd0d 100644
--- a/Spigot-API-Patches/LootTable-API.patch
+++ b/Spigot-API-Patches/LootTable-API.patch
@@ -313,8 +313,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import com.destroystokyo.paper.loottable.LootableBlockInventory;
  import org.bukkit.DyeColor;
  import org.bukkit.loot.Lootable;
- import org.jetbrains.annotations.NotNull;
-@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
+ import org.jetbrains.annotations.Nullable;
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a captured state of a ShulkerBox.
   */
diff --git a/work/Bukkit b/work/Bukkit
index 146a7e4bd7..f563167d33 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 146a7e4bd764990c56bb326643e92eb69f24d27e
+Subproject commit f563167d33eac6217c94e1cdffb1bc0bfd3031c9
diff --git a/work/CraftBukkit b/work/CraftBukkit
index d49530f9c4..9c7acb6cbe 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit d49530f9c40ebfa002fdbdd814e324a6cc9aee8a
+Subproject commit 9c7acb6cbe029508825711021a5ebcba3d419943