diff --git a/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
index b506cfa4da..e55d2d4bb1 100644
--- a/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/Add-an-asterisk-to-legacy-API-plugins.patch
@@ -7,7 +7,7 @@ Not here to name and shame, only so server admins can be aware of which
 plugins have and haven't been updated.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 33cad9015..aff1d8e9b 100644
+index a4aabfe7f..f462b631b 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -0,0 +0,0 @@ public interface UnsafeValues {
diff --git a/work/Bukkit b/work/Bukkit
index 2dcc44dcec..410a601d00 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 2dcc44dcec8a985ef4da59f6c95ea4ed732f9444
+Subproject commit 410a601d008d1c13612815b900f28c00ac4b90a6
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 479ec05e3b..f598574711 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 479ec05e3b15937ae7e988d9050d167fc6ba307d
+Subproject commit f5985747113f69decf936726bd609e55611ab465