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

ResourcePackManager: cleaned up pack loading error handling

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-05-31 17:58:47 +01:00
parent 1b4723d816
commit 7864a315f6
3 changed files with 57 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,33 +69,31 @@ class ResourcePackManager{
foreach($resourcePacksConfig->get("resource_stack", []) as $pos => $pack){
try{
$packPath = $this->path . DIRECTORY_SEPARATOR . $pack;
if(file_exists($packPath)){
$newPack = null;
//Detect the type of resource pack.
if(is_dir($packPath)){
$logger->warning("Skipped resource entry $pack due to directory resource packs currently unsupported");
}else{
$info = new \SplFileInfo($packPath);
switch($info->getExtension()){
case "zip":
case "mcpack":
$newPack = new ZippedResourcePack($packPath);
break;
default:
$logger->warning("Skipped resource entry $pack due to format not recognized");
break;
}
}
if($newPack instanceof ResourcePack){
$this->resourcePacks[] = $newPack;
$this->uuidList[strtolower($newPack->getPackId())] = $newPack;
}
}else{
$logger->warning("Skipped resource entry $pack due to file or directory not found");
if(!file_exists($packPath)){
throw new ResourcePackException("File or directory not found");
}
}catch(\Throwable $e){
$logger->logException($e);
if(is_dir($packPath)){
throw new ResourcePackException("Directory resource packs are unsupported");
}
$newPack = null;
//Detect the type of resource pack.
$info = new \SplFileInfo($packPath);
switch($info->getExtension()){
case "zip":
case "mcpack":
$newPack = new ZippedResourcePack($packPath);
break;
}
if($newPack instanceof ResourcePack){
$this->resourcePacks[] = $newPack;
$this->uuidList[strtolower($newPack->getPackId())] = $newPack;
}else{
throw new ResourcePackException("Format not recognized");
}
}catch(ResourcePackException $e){
$logger->critical("Could not load resource pack \"$pack\": " . $e->getMessage());
}
}