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

LegacySkinAdapter: fix some wacky cape handling logic

Browse Source 
I added checks for length validity locally and ran into some interesting behaviour because of this code.
This commit is contained in:
Dylan K. Taylor 2019-12-09 18:16:46 +00:00
parent 5682cc8d53
commit a4d68fb32b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,10 +31,8 @@ use function is_string;
class LegacySkinAdapter implements SkinAdapter{ class LegacySkinAdapter implements SkinAdapter{
public function toSkinData(Skin $skin) : SkinData{ public function toSkinData(Skin $skin) : SkinData{
$capeData = new SkinImage(32, 64, $skin->getCapeData()); $capeData = $skin->getCapeData();
if($skin->getCapeData() === ""){ $capeImage = $capeData === "" ? new SkinImage(0, 0, "") : new SkinImage(32, 64, $capeData);
$capeData = new SkinImage(0, 0, $skin->getCapeData());
}
$geometryName = $skin->getGeometryName(); $geometryName = $skin->getGeometryName();
if($geometryName === ""){ if($geometryName === ""){
$geometryName = "geometry.humanoid.custom"; $geometryName = "geometry.humanoid.custom";
@ -43,7 +41,7 @@ class LegacySkinAdapter implements SkinAdapter{
$skin->getSkinId(), $skin->getSkinId(),
json_encode(["geometry" => ["default" => $geometryName]]), json_encode(["geometry" => ["default" => $geometryName]]),
SkinImage::fromLegacy($skin->getSkinData()), [], SkinImage::fromLegacy($skin->getSkinData()), [],
$capeData, $capeImage,
$skin->getGeometryData() $skin->getGeometryData()
); );
} }