diff --git a/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch
index ecdf4e701..46233858c 100644
--- a/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch
+++ b/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch
@@ -7,10 +7,10 @@ Don't constantly send format: false for all formatting options when parent alrea
 has it false
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index 50a85af76501e1202286df3cf9fb6af9ea542f87..1d2c77817cc5627ff49d6b1000c25866003f4d47 100644
+index 1582a799e456402453c43c2e0c6b8a194951a9dd..ede1cffb5de4f958ecf57b6c62a0d63896274746 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-@@ -47,6 +47,7 @@ public final class CraftChatMessage {
+@@ -46,6 +46,7 @@ public final class CraftChatMessage {
          // Separate pattern with no group 3, new lines are part of previous string
          private static final Pattern INCREMENTAL_PATTERN_KEEP_NEWLINES = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-orx])|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " ]|$))))", Pattern.CASE_INSENSITIVE);
          // ChatColor.b does not explicitly reset, its more of empty
@@ -18,7 +18,7 @@ index 50a85af76501e1202286df3cf9fb6af9ea542f87..1d2c77817cc5627ff49d6b1000c25866
          private static final ChatModifier RESET = ChatModifier.a.setBold(false).setItalic(false).setUnderline(false).setStrikethrough(false).setRandom(false);
  
          private final List<IChatBaseComponent> list = new ArrayList<IChatBaseComponent>();
-@@ -68,6 +69,7 @@ public final class CraftChatMessage {
+@@ -67,6 +68,7 @@ public final class CraftChatMessage {
              Matcher matcher = (keepNewlines ? INCREMENTAL_PATTERN_KEEP_NEWLINES : INCREMENTAL_PATTERN).matcher(message);
              String match = null;
              boolean needsAdd = false;
@@ -26,7 +26,7 @@ index 50a85af76501e1202286df3cf9fb6af9ea542f87..1d2c77817cc5627ff49d6b1000c25866
              while (matcher.find()) {
                  int groupId = 0;
                  while ((match = matcher.group(++groupId)) == null) {
-@@ -113,7 +115,26 @@ public final class CraftChatMessage {
+@@ -112,7 +114,26 @@ public final class CraftChatMessage {
                              throw new AssertionError("Unexpected message format");
                          }
                      } else { // Color resets formatting
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 24c79a144..ff2b9440f 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 24c79a14463b6ff00adf63098566dc84588f8fd9
+Subproject commit ff2b9440f5442fb2b1e485b28aee201f47c512f2