diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..e41741f36
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @pmmp/server-developers
diff --git a/build/php b/build/php
index 084822aa9..a51259d7a 160000
--- a/build/php
+++ b/build/php
@@ -1 +1 @@
-Subproject commit 084822aa9e381ca05591e902a2613fe971dff3fd
+Subproject commit a51259d7a6ea649d64f409fc0276baa59cf4f19a
diff --git a/changelogs/5.21.md b/changelogs/5.21.md
index b8131a3c8..9b3c2f89a 100644
--- a/changelogs/5.21.md
+++ b/changelogs/5.21.md
@@ -101,3 +101,12 @@ Consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if
 ## Internals
 - Fixed incorrect visibility of `createEntity` in spawn eggs.
 - Added support for newer `BedrockBlockUpgradeSchema` in `BlockStateUpgrader`.
+
+# 5.21.1
+Released 12th November 2024.
+
+## Fixes
+- Fixed server crash when applying a cooldown to an item with 1 count.
+- Fixed garbage collector cycle count increase on player disconnect.
+- Fixed weakness effect being applied to all attack types, causing damage splash potions to become weaker.
+- Fixed Enchanted Golden Apple regeneration effect amplifier to match vanilla.
diff --git a/src/VersionInfo.php b/src/VersionInfo.php
index 8fe6d32dd..bc1b24c62 100644
--- a/src/VersionInfo.php
+++ b/src/VersionInfo.php
@@ -31,7 +31,7 @@ use function str_repeat;
 
 final class VersionInfo{
 	public const NAME = "PocketMine-MP";
-	public const BASE_VERSION = "5.21.1";
+	public const BASE_VERSION = "5.21.2";
 	public const IS_DEVELOPMENT_BUILD = true;
 	public const BUILD_CHANNEL = "stable";
 
diff --git a/src/inventory/ArmorInventory.php b/src/inventory/ArmorInventory.php
index 0b3ae5b7b..8591cc65b 100644
--- a/src/inventory/ArmorInventory.php
+++ b/src/inventory/ArmorInventory.php
@@ -42,7 +42,7 @@ class ArmorInventory extends SimpleInventory{
 	){
 		parent::__construct(4);
 
-		$this->validators->add(new CallbackSlotValidator($this->validate(...)));
+		$this->validators->add(new CallbackSlotValidator(self::validate(...)));
 	}
 
 	public function getHolder() : Living{
@@ -81,7 +81,7 @@ class ArmorInventory extends SimpleInventory{
 		$this->setItem(self::SLOT_FEET, $boots);
 	}
 
-	private function validate(Inventory $inventory, Item $item, int $slot) : ?TransactionValidationException{
+	private static function validate(Inventory $inventory, Item $item, int $slot) : ?TransactionValidationException{
 		if($item instanceof Armor){
 			if($item->getArmorSlot() !== $slot){
 				return new TransactionValidationException("Armor item is in wrong slot");