mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Drop pocketmine/uuid for ramsey/uuid

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-03-16 23:03:00 +00:00
parent 6d622c4020
commit 72de45f0e9
24 changed files with 374 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/mcpe/handler/LoginPacketHandler.php
View File

@ -43,7 +43,7 @@ use pocketmine\player\Player;
use pocketmine\player\PlayerInfo;
use pocketmine\player\XboxLivePlayerInfo;
use pocketmine\Server;
use pocketmine\uuid\UUID;
use Ramsey\Uuid\Uuid;
use function is_array;
/**
@ -112,11 +112,10 @@ class LoginPacketHandler extends PacketHandler{
return true;
}
try{
$uuid = UUID::fromString($extraData->identity);
}catch(\InvalidArgumentException $e){
throw BadPacketException::wrap($e, "Failed to parse login UUID");
if(!Uuid::isValid($extraData->identity)){
throw new BadPacketException("Invalid login UUID");
}
$uuid = Uuid::fromString($extraData->identity);
if($extraData->XUID !== ""){
$playerInfo = new XboxLivePlayerInfo(
$extraData->XUID,