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

ZippedResourcePack: Make manifest parse errors less useless

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-21 09:53:16 +01:00
parent eccc249009
commit 1ef6f5d166
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/resourcepacks/ZippedResourcePack.php
View File

@ -86,8 +86,11 @@ class ZippedResourcePack implements ResourcePack{
$archive->close(); $archive->close();
$manifest = json_decode($manifestData); $manifest = json_decode($manifestData);
if($manifest === null or !self::verifyManifest($manifest)){ if($manifest === null){
throw new ResourcePackException("manifest.json is invalid or incomplete"); throw new ResourcePackException("Failed to parse manifest.json: " . json_last_error_msg());
}
if(!self::verifyManifest($manifest)){
throw new ResourcePackException("manifest.json is missing required fields");
} }
$this->manifest = $manifest; $this->manifest = $manifest;