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

Use JSON_THROW_ON_ERROR for json_encode() and json_decode()

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-12-08 19:14:07 +00:00
parent c6466a6da9
commit 8b73549355
9 changed files with 20 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/mcpe/convert/LegacySkinAdapter.php
View File

@ -31,9 +31,9 @@ use function is_array;
use function is_string;
use function json_decode;
use function json_encode;
use function json_last_error_msg;
use function random_bytes;
use function str_repeat;
use const JSON_THROW_ON_ERROR;
class LegacySkinAdapter implements SkinAdapter{
@ -44,14 +44,10 @@ class LegacySkinAdapter implements SkinAdapter{
if($geometryName === ""){
$geometryName = "geometry.humanoid.custom";
}
$resourcePatch = json_encode(["geometry" => ["default" => $geometryName]]);
if($resourcePatch === false){
throw new \RuntimeException("json_encode() failed: " . json_last_error_msg());
}
return new SkinData(
$skin->getSkinId(),
"", //TODO: playfab ID
$resourcePatch,
json_encode(["geometry" => ["default" => $geometryName]], JSON_THROW_ON_ERROR),
SkinImage::fromLegacy($skin->getSkinData()), [],
$capeImage,
$skin->getGeometryData()