From 2dee1dbc283fc8af4ccb3004be0ce47a1c82ef24 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 1 Nov 2021 15:41:21 +0000 Subject: [PATCH] Remove ridiculous code in ResourcePackManager --- src/pocketmine/resourcepacks/ResourcePackManager.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pocketmine/resourcepacks/ResourcePackManager.php b/src/pocketmine/resourcepacks/ResourcePackManager.php index aa21079d5..d1cd2803c 100644 --- a/src/pocketmine/resourcepacks/ResourcePackManager.php +++ b/src/pocketmine/resourcepacks/ResourcePackManager.php @@ -31,6 +31,9 @@ use function file_exists; use function gettype; use function is_array; use function is_dir; +use function is_float; +use function is_int; +use function is_string; use function mkdir; use function strtolower; use const DIRECTORY_SEPARATOR; @@ -78,14 +81,12 @@ class ResourcePackManager{ } foreach($resourceStack as $pos => $pack){ - try{ - $pack = (string) $pack; - }catch(\ErrorException $e){ + if(!is_string($pack) && !is_int($pack) && !is_float($pack)){ $logger->critical("Found invalid entry in resource pack list at offset $pos of type " . gettype($pack)); continue; } + $pack = (string) $pack; try{ - /** @var string $pack */ $packPath = $this->path . DIRECTORY_SEPARATOR . $pack; if(!file_exists($packPath)){ throw new ResourcePackException("File or directory not found");