From 39cc590829dbdcce64f6ecb0953e69d60d93364a Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 21 Oct 2019 22:26:48 +0100 Subject: [PATCH] Skin: accommodate JSON geometry containing comments, closes #3121 --- src/pocketmine/entity/Skin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/entity/Skin.php b/src/pocketmine/entity/Skin.php index 2c66dfaee..d5a1477ea 100644 --- a/src/pocketmine/entity/Skin.php +++ b/src/pocketmine/entity/Skin.php @@ -23,9 +23,9 @@ declare(strict_types=1); namespace pocketmine\entity; +use Ahc\Json\Comment as CommentedJsonDecoder; use function implode; use function in_array; -use function json_decode; use function json_encode; use function strlen; @@ -129,7 +129,7 @@ class Skin{ */ public function debloatGeometryData() : void{ if($this->geometryData !== ""){ - $this->geometryData = (string) json_encode(json_decode($this->geometryData)); + $this->geometryData = (string) json_encode((new CommentedJsonDecoder())->decode($this->geometryData)); } } }