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 075538d1ce..523b05ea0c 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 20b3a9ee..c4083b4f 100644
+index 33cad901..aff1d8e9 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 c5ab54d891..1f85e52623 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c5ab54d8912abadb0426ca9acd701732aa4c6e33
+Subproject commit 1f85e52623dbf90e6d6f482660b34cb15f8f0f1b
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 29e7564874..96778caabb 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 29e75648741b877c06165d82241b6b3a417474f6
+Subproject commit 96778caabb82eff6c2155d016bea938cebed3953