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

Some cleanup to player net session handling for connect/disconnect

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-03-14 14:32:27 +00:00
parent fa7a4dc22e
commit 26a5d97499
8 changed files with 187 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/pocketmine/network/Network.php
View File

@ -28,7 +28,6 @@ namespace pocketmine\network;
use pocketmine\event\server\NetworkInterfaceRegisterEvent;
use pocketmine\event\server\NetworkInterfaceUnregisterEvent;
use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\mcpe\protocol\PacketPool;
use function get_class;
use function spl_object_id;
@ -46,11 +45,12 @@ class Network{
/** @var string */
private $name;
/** @var NetworkSession[] */
private $updateSessions = [];
/** @var NetworkSessionManager */
private $sessionManager;
public function __construct(){
PacketPool::init();
$this->sessionManager = new NetworkSessionManager();
}
public function addStatistics(float $upload, float $download) : void{
@ -78,12 +78,15 @@ class Network{
return $this->interfaces;
}
/**
* @return NetworkSessionManager
*/
public function getSessionManager() : NetworkSessionManager{
return $this->sessionManager;
}
public function getConnectionCount() : int{
$count = 0;
foreach($this->interfaces as $interface){
$count += $interface->getConnectionCount();
}
return $count;
return $this->sessionManager->getSessionCount();
}
public function tick() : void{
@ -91,11 +94,7 @@ class Network{
$interface->tick();
}
foreach($this->updateSessions as $k => $session){
if(!$session->isConnected() or !$session->tick()){
unset($this->updateSessions[$k]);
}
}
$this->sessionManager->tick();
}
/**
@ -187,8 +186,4 @@ class Network{
$interface->addRawPacketFilter($regex);
}
}
public function scheduleSessionTick(NetworkSession $session) : void{
$this->updateSessions[spl_object_id($session)] = $session;
}
}