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

ResourcePack: slightly better handling of bad configs

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-05-31 18:30:21 +01:00
parent 7864a315f6
commit f27c6fcf70
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,8 +66,20 @@ class ResourcePackManager{
$logger->info("Loading resource packs..."); $logger->info("Loading resource packs...");
foreach($resourcePacksConfig->get("resource_stack", []) as $pos => $pack){ $resourceStack = $resourcePacksConfig->get("resource_stack", []);
if(!is_array($resourceStack)){
throw new \InvalidArgumentException("\"resource_stack\" key should contain a list of pack names");
}
foreach($resourceStack as $pos => $pack){
try{ try{
$pack = (string) $pack;
}catch(\ErrorException $e){
$logger->critical("Found invalid entry in resource pack list at offset $pos of type " . gettype($pack));
continue;
}
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");