diff --git a/Spigot-API-Patches/0121-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0121-Add-an-asterisk-to-legacy-API-plugins.patch
index 524eccd2d8..f333704ea3 100644
--- a/Spigot-API-Patches/0121-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/0121-Add-an-asterisk-to-legacy-API-plugins.patch
@@ -1,4 +1,4 @@
-From e90f5e3a1992b807e97829fc570ce25f05b7811c Mon Sep 17 00:00:00 2001
+From 218ebb72abe3b026f00a6378ff1529e4e2210c0b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 19 Jul 2018 15:07:02 -0500
 Subject: [PATCH] Add an asterisk to legacy API plugins
@@ -7,10 +7,10 @@ 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
-@@ -66,4 +66,10 @@ public interface UnsafeValues {
+@@ -67,4 +67,10 @@ public interface UnsafeValues {
       * @return true if a file matching this key was found and deleted
       */
      boolean removeAdvancement(NamespacedKey key);
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