mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-11 14:05:35 +00:00
Code Issues Projects Releases Wiki Activity

Better checks on resource patch

Browse Source
This commit is contained in:
Stephen 2019-11-28 19:48:34 -05:00
parent 3dd53ad998
commit 5d17405b92
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/network/mcpe/protocol/types/LegacySkinAdapter.php
View File

@ -25,6 +25,9 @@ namespace pocketmine\network\mcpe\protocol\types;
use pocketmine\entity\Skin; use pocketmine\entity\Skin;
use function is_array;
use function is_string;
class LegacySkinAdapter implements SkinAdapter{ class LegacySkinAdapter implements SkinAdapter{
public function toSkinData(Skin $skin) : SkinData{ public function toSkinData(Skin $skin) : SkinData{
@ -45,8 +48,10 @@ class LegacySkinAdapter implements SkinAdapter{
$capeData = $data->getCapeImage()->getData(); $capeData = $data->getCapeImage()->getData();
$geometryName = ""; $geometryName = "";
$resourcePatch = json_decode($data->getResourcePatch(), true); $resourcePatch = json_decode($data->getResourcePatch(), true);
if(isset($resourcePatch["geometry"]) && isset($resourcePatch["geometry"]["default"])){ if(is_array($resourcePatch["geometry"]) && is_string($resourcePatch["geometry"]["default"])){
$geometryName = $resourcePatch["geometry"]["default"]; $geometryName = $resourcePatch["geometry"]["default"];
}else{
//TODO: Kick for invalid skin
} }
if($data->isPersona()){ if($data->isPersona()){
return new Skin("Standard_Custom", str_repeat(random_bytes(3) . "\xff", 2048), "", "geometry.humanoid.custom"); return new Skin("Standard_Custom", str_repeat(random_bytes(3) . "\xff", 2048), "", "geometry.humanoid.custom");