diff --git a/Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch
index 5f8073b62f..8478718a1c 100644
--- a/Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -19,5 +19,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
          }
  
-         if (entity instanceof EntityPlayer && health == 0) {
+         if (health == 0) {
 --
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Set-health-before-death-event.patch b/Spigot-Server-Patches/Set-health-before-death-event.patch
index e407742df0..d0efafae6e 100644
--- a/Spigot-Server-Patches/Set-health-before-death-event.patch
+++ b/Spigot-Server-Patches/Set-health-before-death-event.patch
@@ -30,10 +30,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
 +            this.getHandle().setHealth((float) health);
 +        }
-+        // Paper end
-+
-         if (entity instanceof EntityPlayer && health == 0) {
-             ((EntityPlayer) entity).die(DamageSource.GENERIC);
++        
+         if (health == 0) {
+             getHandle().die(DamageSource.GENERIC);
          }
  
 -        getHandle().setHealth((float) health);
diff --git a/work/Bukkit b/work/Bukkit
index c5354dfc26..9335c0ba4c 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c5354dfc2689616b92a74feea44b7fa5ce3238ee
+Subproject commit 9335c0ba4cba58315c014ec460f734f180ab571d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 21e3b05522..83a9dbdef6 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 21e3b055225dade6100342632f059509ca638c2a
+Subproject commit 83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9
diff --git a/work/Spigot b/work/Spigot
index 078e2f8b3c..90f61bc448 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 078e2f8b3c4d46cfc88cef5a0818891aeca78a2e
+Subproject commit 90f61bc448cdf47982cbeadcad280f229fe10b24