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

Merge branch 'release/3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-12-27 15:53:12 +00:00
parent 8564efc011 6417cff618
commit cf20f0e23a
3 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,8 @@ declare(strict_types=1);
namespace pocketmine\resourcepacks;
use Ahc\Json\Comment as CommentedJsonDecoder;
class ZippedResourcePack implements ResourcePack{
/**
@@ -86,10 +88,13 @@ class ZippedResourcePack implements ResourcePack{
$archive->close();
$manifest = json_decode($manifestData);
if($manifest === null){
throw new ResourcePackException("Failed to parse manifest.json: " . json_last_error_msg());
//maybe comments in the json, use stripped decoder (thanks mojang)
try{
$manifest = (new CommentedJsonDecoder())->decode($manifestData);
}catch(\RuntimeException $e){
throw new ResourcePackException("Failed to parse manifest.json: " . $e->getMessage(), $e->getCode(), $e);
}
if(!self::verifyManifest($manifest)){
throw new ResourcePackException("manifest.json is missing required fields");
}