From 2548422973a4b6f4417f9fe9b0e02164991ad583 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Sun, 20 Apr 2025 16:44:23 +0100
Subject: [PATCH] AvailableEnchantmentRegistry: reject non-string tags fixes
 https://crash.pmmp.io/view/12627328

---
 src/item/enchantment/AvailableEnchantmentRegistry.php | 3 +++
 src/utils/Utils.php                                   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/item/enchantment/AvailableEnchantmentRegistry.php b/src/item/enchantment/AvailableEnchantmentRegistry.php
index eed7bff52..2d8dafa4b 100644
--- a/src/item/enchantment/AvailableEnchantmentRegistry.php
+++ b/src/item/enchantment/AvailableEnchantmentRegistry.php
@@ -28,6 +28,7 @@ use pocketmine\item\enchantment\ItemEnchantmentTags as Tags;
 use pocketmine\item\enchantment\VanillaEnchantments as Enchantments;
 use pocketmine\item\Item;
 use pocketmine\utils\SingletonTrait;
+use pocketmine\utils\Utils;
 use function array_filter;
 use function array_values;
 use function count;
@@ -129,6 +130,7 @@ final class AvailableEnchantmentRegistry{
 		if(!$this->isRegistered($enchantment)){
 			throw new \LogicException("Cannot set primary item tags for non-registered enchantment");
 		}
+		Utils::validateArrayValueType($tags, fn(string $v) => 1);
 		$this->primaryItemTags[spl_object_id($enchantment)] = array_values($tags);
 	}
 
@@ -152,6 +154,7 @@ final class AvailableEnchantmentRegistry{
 		if(!$this->isRegistered($enchantment)){
 			throw new \LogicException("Cannot set secondary item tags for non-registered enchantment");
 		}
+		Utils::validateArrayValueType($tags, fn(string $v) => 1);
 		$this->secondaryItemTags[spl_object_id($enchantment)] = array_values($tags);
 	}
 
diff --git a/src/utils/Utils.php b/src/utils/Utils.php
index 046296cf4..800bd0183 100644
--- a/src/utils/Utils.php
+++ b/src/utils/Utils.php
@@ -584,7 +584,7 @@ final class Utils{
 	/**
 	 * @phpstan-template TMemberType
 	 * @phpstan-param array<mixed, TMemberType> $array
-	 * @phpstan-param \Closure(TMemberType) : void $validator
+	 * @phpstan-param \Closure(TMemberType) : mixed $validator
 	 */
 	public static function validateArrayValueType(array $array, \Closure $validator) : void{
 		foreach(Utils::promoteKeys($array) as $k => $v){