diff --git a/Spigot-API-Patches/0122-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0122-Add-an-asterisk-to-legacy-API-plugins.patch
index 58d44933ad..35dda386fc 100644
--- a/Spigot-API-Patches/0122-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/Spigot-API-Patches/0122-Add-an-asterisk-to-legacy-API-plugins.patch
@@ -1,4 +1,4 @@
-From d7ad6275b2c4d850e971e43d3d3fe0dbeed04cea Mon Sep 17 00:00:00 2001
+From 91f71ba5b2acd3e4d2c1723aacb8d5b74dd97ed3 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 20b3a9ee..c4083b4f 100644
+index 33cad901..aff1d8e9 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -64,4 +64,10 @@ public interface UnsafeValues {
+@@ -66,4 +66,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 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