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

Separate packet-sender functionality from NetworkInterface, break cyclic dependency between NetworkInterface and NetworkSession

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-06-26 18:19:29 +01:00
parent 9cedfeb2b2
commit 7eaca6bbaa
5 changed files with 110 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/network/mcpe/NetworkSession.php
View File

@ -137,10 +137,14 @@ class NetworkSession{
/** @var InventoryManager|null */
private $invManager = null;
public function __construct(Server $server, NetworkSessionManager $manager, NetworkInterface $interface, string $ip, int $port){
/** @var PacketSender */
private $sender;
public function __construct(Server $server, NetworkSessionManager $manager, NetworkInterface $interface, PacketSender $sender, string $ip, int $port){
$this->server = $server;
$this->manager = $manager;
$this->interface = $interface;
$this->sender = $sender;
$this->ip = $ip;
$this->port = $port;
@ -431,7 +435,7 @@ class NetworkSession{
$payload = $this->cipher->encrypt($payload);
Timings::$playerNetworkSendEncryptTimer->stopTiming();
}
$this->interface->putPacket($this, $payload, $immediate);
$this->sender->send($payload, $immediate);
}
private function tryDisconnect(\Closure $func, string $reason) : void{
@ -506,7 +510,7 @@ class NetworkSession{
$this->sendDataPacket($reason === "" ? DisconnectPacket::silent() : DisconnectPacket::message($reason), true);
}
$this->interface->close($this, $notify ? $reason : "");
$this->sender->close($notify ? $reason : "");
}
/**