mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-03 16:49:53 +00:00
Code Issues Projects Releases Wiki Activity

Remove ridiculous code in ResourcePackManager

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-11-01 15:41:21 +00:00
parent 0f0b6f0efa
commit 2dee1dbc28
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/resourcepacks/ResourcePackManager.php
View File

@ -31,6 +31,9 @@ use function file_exists;
use function gettype; use function gettype;
use function is_array; use function is_array;
use function is_dir; use function is_dir;
use function is_float;
use function is_int;
use function is_string;
use function mkdir; use function mkdir;
use function strtolower; use function strtolower;
use const DIRECTORY_SEPARATOR; use const DIRECTORY_SEPARATOR;
@ -78,14 +81,12 @@ class ResourcePackManager{
} }
foreach($resourceStack as $pos => $pack){ foreach($resourceStack as $pos => $pack){
try{ if(!is_string($pack) && !is_int($pack) && !is_float($pack)){
$pack = (string) $pack;
}catch(\ErrorException $e){
$logger->critical("Found invalid entry in resource pack list at offset $pos of type " . gettype($pack)); $logger->critical("Found invalid entry in resource pack list at offset $pos of type " . gettype($pack));
continue; continue;
} }
$pack = (string) $pack;
try{ try{
/** @var string $pack */
$packPath = $this->path . DIRECTORY_SEPARATOR . $pack; $packPath = $this->path . DIRECTORY_SEPARATOR . $pack;
if(!file_exists($packPath)){ if(!file_exists($packPath)){
throw new ResourcePackException("File or directory not found"); throw new ResourcePackException("File or directory not found");