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

More broken mess to spawn 1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-01 20:06:02 +01:00
parent 10ff2948ac
commit 77cd8e7799
52 changed files with 1558 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/network/mcpe/protocol/LoginPacket.php
View File

@ -27,6 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
use pocketmine\network\mcpe\NetworkSession;
use pocketmine\utils\Utils;
class LoginPacket extends DataPacket{
const NETWORK_ID = ProtocolInfo::LOGIN_PACKET;
@ -35,7 +36,6 @@ class LoginPacket extends DataPacket{
public $username;
public $protocol;
public $gameEdition;
public $clientUUID;
public $clientId;
public $identityPublicKey;
@ -63,13 +63,11 @@ class LoginPacket extends DataPacket{
return; //Do not attempt to decode for non-accepted protocols
}
$this->gameEdition = $this->getByte();
$this->setBuffer($this->getString(), 0);
$this->chainData = json_decode($this->get($this->getLInt()), true);
foreach($this->chainData["chain"] as $chain){
$webtoken = $this->decodeToken($chain);
$webtoken = Utils::decodeJWT($chain);
if(isset($webtoken["extraData"])){
if(isset($webtoken["extraData"]["displayName"])){
$this->username = $webtoken["extraData"]["displayName"];
@ -84,7 +82,7 @@ class LoginPacket extends DataPacket{
}
$this->clientDataJwt = $this->get($this->getLInt());
$this->clientData = $this->decodeToken($this->clientDataJwt);
$this->clientData = Utils::decodeJWT($this->clientDataJwt);
$this->clientId = $this->clientData["ClientRandomId"] ?? null;
$this->serverAddress = $this->clientData["ServerAddress"] ?? null;
@ -99,12 +97,6 @@ class LoginPacket extends DataPacket{
//TODO
}
public function decodeToken($token){
list($headB64, $payloadB64, $sigB64) = explode(".", $token);
return json_decode(base64_decode($payloadB64), true);
}
public function handle(NetworkSession $session) : bool{
return $session->handleLogin($this);
}