mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 20:14:31 +00:00
Code Issues Projects Releases Wiki Activity

HandshakePacketHandler no longer depends on NetworkSession

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-04-24 23:18:29 +01:00
parent 7d9df6af6f
commit c869a7f099
3 changed files with 84 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/mcpe/NetworkSession.php
View File

@@ -548,7 +548,9 @@ class NetworkSession{
$this->cipher = new NetworkCipher($encryptionKey);
$this->setHandler(new HandshakePacketHandler($this));
$this->setHandler(new HandshakePacketHandler(function() : void{
$this->onLoginSuccess();
}));
$this->logger->debug("Enabled encryption");
}));
}else{
@@ -557,7 +559,7 @@ class NetworkSession{
}
}
public function onLoginSuccess() : void{
private function onLoginSuccess() : void{
$this->loggedIn = true;
$this->sendDataPacket(PlayStatusPacket::create(PlayStatusPacket::LOGIN_SUCCESS));

17
src/network/mcpe/handler/HandshakePacketHandler.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace pocketmine\network\mcpe\handler;
use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\mcpe\protocol\ClientToServerHandshakePacket;
/**
@@ -31,15 +30,21 @@ use pocketmine\network\mcpe\protocol\ClientToServerHandshakePacket;
*/
class HandshakePacketHandler extends PacketHandler{
/** @var NetworkSession */
private $session;
/**
* @var \Closure
* @phpstan-var \Closure() : void
*/
private $onHandshakeCompleted;
public function __construct(NetworkSession $session){
$this->session = $session;
/**
* @phpstan-param \Closure() : void $onHandshakeCompleted
*/
public function __construct(\Closure $onHandshakeCompleted){
$this->onHandshakeCompleted = $onHandshakeCompleted;
}
public function handleClientToServerHandshake(ClientToServerHandshakePacket $packet) : bool{
$this->session->onLoginSuccess();
($this->onHandshakeCompleted)();
return true;
}
}