diff --git a/BungeeCord b/BungeeCord
index b23a518..21c8f28 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit b23a51825ef46c5b8ffc2fba308b2ebe05328e08
+Subproject commit 21c8f2815a7f84dadf6b813bd8bf2116d950e695
diff --git a/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch b/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
index 493463d..13ea9bf 100644
--- a/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
+++ b/BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch
@@ -1,14 +1,14 @@
-From 2dd0204e7fcbb99832af639ab790a3d7ad783caf Mon Sep 17 00:00:00 2001
+From 3c2617145ca0a4c8b87b000f5f2fbbafad753d7d Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 17:36:31 -0600
 Subject: [PATCH] Better unit tests for Chat API
 
 
 diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-index b4595b32..b0698241 100644
+index 555dd333..3affad9a 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-@@ -675,6 +675,26 @@ public class ComponentsTest
+@@ -685,6 +685,26 @@ public class ComponentsTest
          assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
      }
  
diff --git a/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch b/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch
index bbee4dd..464aacd 100644
--- a/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch
+++ b/BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch
@@ -1,4 +1,4 @@
-From c0d0e8c309f8f6e1419b7b0cc30b7255b902e74a Mon Sep 17 00:00:00 2001
+From f7cabafe6a763350695c963966fd28baa303f3b2 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 25 Nov 2019 19:54:06 +0000
 Subject: [PATCH] Speed up some common exceptions
@@ -59,10 +59,10 @@ index 6c0ef4df..076ddd70 100644
 +    // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index 994a5320..cb1eab74 100644
+index 6cd9e6a4..dffd3b7a 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -46,6 +46,9 @@ public abstract class DefinedPacket
+@@ -47,6 +47,9 @@ public abstract class DefinedPacket
          }
      }
  
@@ -72,7 +72,7 @@ index 994a5320..cb1eab74 100644
      public static void writeString(String s, ByteBuf buf)
      {
          writeString( s, buf, Short.MAX_VALUE );
-@@ -225,13 +228,18 @@ public abstract class DefinedPacket
+@@ -242,13 +245,18 @@ public abstract class DefinedPacket
          byte in;
          while ( true )
          {
diff --git a/BungeeCord-Patches/0055-Additional-DoS-mitigations.patch b/BungeeCord-Patches/0055-Additional-DoS-mitigations.patch
index 1b00ff0..33a3122 100644
--- a/BungeeCord-Patches/0055-Additional-DoS-mitigations.patch
+++ b/BungeeCord-Patches/0055-Additional-DoS-mitigations.patch
@@ -1,4 +1,4 @@
-From d7ec1a5e11b1b0d806f2a0bdcf6a881064081651 Mon Sep 17 00:00:00 2001
+From ce7a08d595ba0ddeb36f29c728d681ef82bac66e Mon Sep 17 00:00:00 2001
 From: "Five (Xer)" <admin@fivepb.me>
 Date: Sat, 30 Jan 2021 18:04:14 +0100
 Subject: [PATCH] Additional DoS mitigations
@@ -8,10 +8,10 @@ Courtesy of Tux and the Velocity Contributors. See:
 https://github.com/VelocityPowered/Velocity/commit/5ceac16a821ea35572ff11412ace8929fd06e278
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index 8751f271..8c9714fd 100644
+index dffd3b7a..dafaba54 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -81,6 +81,7 @@ public abstract class DefinedPacket
+@@ -82,6 +82,7 @@ public abstract class DefinedPacket
          int len = readVarInt( buf );
          if ( len > maxLen * 3 )
          {
@@ -19,7 +19,7 @@ index 8751f271..8c9714fd 100644
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
          }
  
-@@ -89,6 +90,7 @@ public abstract class DefinedPacket
+@@ -90,6 +91,7 @@ public abstract class DefinedPacket
  
          if ( s.length() > maxLen )
          {
@@ -27,7 +27,7 @@ index 8751f271..8c9714fd 100644
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
          }
  
-@@ -550,4 +552,21 @@ public abstract class DefinedPacket
+@@ -567,4 +569,21 @@ public abstract class DefinedPacket
  
      @Override
      public abstract String toString();