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

LegacySkinAdapter: clean up nonsensical code ordering

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-12-09 18:26:20 +00:00
parent a4d68fb32b
commit 1a99938e4b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,12 @@ class LegacySkinAdapter implements SkinAdapter{
} }
public function fromSkinData(SkinData $data) : Skin{ public function fromSkinData(SkinData $data) : Skin{
$capeData = $data->getCapeImage()->getData(); if($data->isPersona()){
return new Skin("Standard_Custom", str_repeat(random_bytes(3) . "\xff", 2048));
}
$capeData = $data->isPersonaCapeOnClassic() ? "" : $data->getCapeImage()->getData();
$geometryName = ""; $geometryName = "";
$resourcePatch = json_decode($data->getResourcePatch(), true); $resourcePatch = json_decode($data->getResourcePatch(), true);
if(is_array($resourcePatch["geometry"]) && is_string($resourcePatch["geometry"]["default"])){ if(is_array($resourcePatch["geometry"]) && is_string($resourcePatch["geometry"]["default"])){
@ -55,11 +60,7 @@ class LegacySkinAdapter implements SkinAdapter{
}else{ }else{
//TODO: Kick for invalid skin //TODO: Kick for invalid skin
} }
if($data->isPersona()){
return new Skin("Standard_Custom", str_repeat(random_bytes(3) . "\xff", 2048));
}elseif($data->isPersonaCapeOnClassic()){
$capeData = "";
}
return new Skin($data->getSkinId(), $data->getSkinImage()->getData(), $capeData, $geometryName, $data->getGeometryData()); return new Skin($data->getSkinId(), $data->getSkinImage()->getData(), $capeData, $geometryName, $data->getGeometryData());
} }
} }