diff --git a/patches/api/Support-hex-colors-in-getLastColors.patch b/patches/api/Support-hex-colors-in-getLastColors.patch
deleted file mode 100644
index 5548b0c4c9..0000000000
--- a/patches/api/Support-hex-colors-in-getLastColors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gerrygames <gecam59@gmail.com>
-Date: Thu, 16 Jul 2020 10:40:10 +0200
-Subject: [PATCH] Support hex colors in getLastColors
-
-
-diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/ChatColor.java
-+++ b/src/main/java/org/bukkit/ChatColor.java
-@@ -0,0 +0,0 @@ public enum ChatColor {
-         return new String(b);
-     }
- 
-+    private static final Pattern HEX_COLOR_PATTERN = Pattern.compile(COLOR_CHAR + "x(?>" + COLOR_CHAR + "[0-9a-f]){6}", Pattern.CASE_INSENSITIVE); // Paper - Support hex colors in getLastColors
-     /**
-      * Gets the ChatColors used at the end of the given input string.
-      *
-@@ -0,0 +0,0 @@ public enum ChatColor {
-         for (int index = length - 1; index > -1; index--) {
-             char section = input.charAt(index);
-             if (section == COLOR_CHAR && index < length - 1) {
-+                // Paper start - Support hex colors
-+                if (index > 11 && input.charAt(index - 12) == COLOR_CHAR && (input.charAt(index - 11) == 'x' || input.charAt(index - 11) == 'X')) {
-+                    String color = input.substring(index - 12, index + 2);
-+                    if (HEX_COLOR_PATTERN.matcher(color).matches()) {
-+                        result = color + result;
-+                        break;
-+                    }
-+                }
-+                // Paper end
-                 char c = input.charAt(index + 1);
-                 ChatColor color = getByChar(c);
- 
diff --git a/patches/server/Add-critical-damage-API.patch b/patches/server/Add-critical-damage-API.patch
index 0bea5cb688..38d42e0cd2 100644
--- a/patches/server/Add-critical-damage-API.patch
+++ b/patches/server/Add-critical-damage-API.patch
@@ -89,7 +89,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
 -            return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled);
 +            return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
-         } else if (sourceType == DamageTypes.OUT_OF_WORLD) {
+         } else if (source.is(DamageTypes.OUT_OF_WORLD)) {
              EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions);
              event.setCancelled(cancelled);
 @@ -0,0 +0,0 @@ public class CraftEventFactory {
diff --git a/work/Bukkit b/work/Bukkit
index 2651717c7d..2b4582fb65 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 2651717c7d47696a774dfbe3ba1db6c6cfb8a4c5
+Subproject commit 2b4582fb6538a04313af12510624853d02250aba
diff --git a/work/CraftBukkit b/work/CraftBukkit
index dbc32ffa06..f7707086d1 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit dbc32ffa0667ee6d02771283f19c7ccf8c965563
+Subproject commit f7707086d107d825109234dd3020e22558dd1378