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

Updated RakLib to get ITC efficiency enhancements

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-02-15 12:29:16 +00:00
parent 19f0d7f336
commit 01255c5368
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -413,12 +413,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/RakLib.git", "url": "https://github.com/pmmp/RakLib.git",
"reference": "44ebbd68eeb25c07f1d4c1d1af1f7abd5904b76c" "reference": "2d19bbaa4fb92d9eabe8c027ea0af9dbd6a90100"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/RakLib/zipball/44ebbd68eeb25c07f1d4c1d1af1f7abd5904b76c", "url": "https://api.github.com/repos/pmmp/RakLib/zipball/2d19bbaa4fb92d9eabe8c027ea0af9dbd6a90100",
"reference": "44ebbd68eeb25c07f1d4c1d1af1f7abd5904b76c", "reference": "2d19bbaa4fb92d9eabe8c027ea0af9dbd6a90100",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -446,7 +446,7 @@
"source": "https://github.com/pmmp/RakLib/tree/master", "source": "https://github.com/pmmp/RakLib/tree/master",
"issues": "https://github.com/pmmp/RakLib/issues" "issues": "https://github.com/pmmp/RakLib/issues"
}, },
"time": "2019-01-26T16:51:18+00:00" "time": "2019-02-15T12:21:28+00:00"
}, },
{ {
"name": "pocketmine/snooze", "name": "pocketmine/snooze",

30
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -68,7 +68,7 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
/** @var NetworkSession[] */ /** @var NetworkSession[] */
private $sessions = []; private $sessions = [];
/** @var string[] */ /** @var int[] */
private $identifiers = []; private $identifiers = [];
/** @var ServerHandler */ /** @var ServerHandler */
@ -118,11 +118,11 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
} }
} }
public function closeSession(string $identifier, string $reason) : void{ public function closeSession(int $sessionId, string $reason) : void{
if(isset($this->sessions[$identifier])){ if(isset($this->sessions[$sessionId])){
$session = $this->sessions[$identifier]; $session = $this->sessions[$sessionId];
unset($this->identifiers[spl_object_id($session)]); unset($this->identifiers[spl_object_id($session)]);
unset($this->sessions[$identifier]); unset($this->sessions[$sessionId]);
$session->onClientDisconnect($reason); $session->onClientDisconnect($reason);
} }
} }
@ -140,19 +140,19 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
$this->interface->shutdown(); $this->interface->shutdown();
} }
public function openSession(string $identifier, string $address, int $port, int $clientID) : void{ public function openSession(int $sessionId, string $address, int $port, int $clientID) : void{
$session = new NetworkSession($this->server, $this, $address, $port); $session = new NetworkSession($this->server, $this, $address, $port);
$this->sessions[$identifier] = $session; $this->sessions[$sessionId] = $session;
$this->identifiers[spl_object_id($session)] = $identifier; $this->identifiers[spl_object_id($session)] = $sessionId;
} }
public function handleEncapsulated(string $identifier, EncapsulatedPacket $packet, int $flags) : void{ public function handleEncapsulated(int $sessionId, EncapsulatedPacket $packet, int $flags) : void{
if(isset($this->sessions[$identifier])){ if(isset($this->sessions[$sessionId])){
if($packet->buffer === "" or $packet->buffer{0} !== self::MCPE_RAKNET_PACKET_ID){ if($packet->buffer === "" or $packet->buffer{0} !== self::MCPE_RAKNET_PACKET_ID){
return; return;
} }
//get this now for blocking in case the player was closed before the exception was raised //get this now for blocking in case the player was closed before the exception was raised
$session = $this->sessions[$identifier]; $session = $this->sessions[$sessionId];
$address = $session->getIp(); $address = $session->getIp();
$port = $session->getPort(); $port = $session->getPort();
$buf = substr($packet->buffer, 1); $buf = substr($packet->buffer, 1);
@ -193,7 +193,7 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
$this->interface->addRawPacketFilter($regex); $this->interface->addRawPacketFilter($regex);
} }
public function notifyACK(string $identifier, int $identifierACK) : void{ public function notifyACK(int $sessionId, int $identifierACK) : void{
} }
@ -239,9 +239,9 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
} }
} }
public function updatePing(string $identifier, int $pingMS) : void{ public function updatePing(int $sessionId, int $pingMS) : void{
if(isset($this->sessions[$identifier])){ if(isset($this->sessions[$sessionId])){
$this->sessions[$identifier]->updatePing($pingMS); $this->sessions[$sessionId]->updatePing($pingMS);
} }
} }
} }