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

InGamePacketHandler: handle InvalidSkinException thrown by SkinAdapter::fromSkinData()

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-06-17 22:31:44 +01:00
parent 05615b3eb7
commit 6f4d4be3da
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/mcpe/handler/InGamePacketHandler.php
View File

@ -27,6 +27,7 @@ use pocketmine\block\ItemFrame;
use pocketmine\block\Sign; use pocketmine\block\Sign;
use pocketmine\block\utils\SignText; use pocketmine\block\utils\SignText;
use pocketmine\entity\animation\ConsumingItemAnimation; use pocketmine\entity\animation\ConsumingItemAnimation;
use pocketmine\entity\InvalidSkinException;
use pocketmine\event\player\PlayerEditBookEvent; use pocketmine\event\player\PlayerEditBookEvent;
use pocketmine\inventory\transaction\action\InventoryAction; use pocketmine\inventory\transaction\action\InventoryAction;
use pocketmine\inventory\transaction\CraftingTransaction; use pocketmine\inventory\transaction\CraftingTransaction;
@ -634,7 +635,12 @@ class InGamePacketHandler extends PacketHandler{
} }
public function handlePlayerSkin(PlayerSkinPacket $packet) : bool{ public function handlePlayerSkin(PlayerSkinPacket $packet) : bool{
return $this->player->changeSkin(SkinAdapterSingleton::get()->fromSkinData($packet->skin), $packet->newSkinName, $packet->oldSkinName); try{
$skin = SkinAdapterSingleton::get()->fromSkinData($packet->skin);
}catch(InvalidSkinException $e){
throw BadPacketException::wrap($e, "Invalid skin in PlayerSkinPacket");
}
return $this->player->changeSkin($skin, $packet->newSkinName, $packet->oldSkinName);
} }
public function handleSubClientLogin(SubClientLoginPacket $packet) : bool{ public function handleSubClientLogin(SubClientLoginPacket $packet) : bool{