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

bring RakLibInterface up to speed with latest RakLib

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-04-19 12:27:44 +01:00
parent c097188a97
commit c6d6afe65e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/mcpe/raklib/RakLibInterface.php
View File

@ -34,7 +34,6 @@ use pocketmine\utils\Filesystem;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
use raklib\protocol\EncapsulatedPacket; use raklib\protocol\EncapsulatedPacket;
use raklib\protocol\PacketReliability; use raklib\protocol\PacketReliability;
use raklib\RakLib;
use raklib\server\ipc\RakLibToUserThreadMessageReceiver; use raklib\server\ipc\RakLibToUserThreadMessageReceiver;
use raklib\server\ipc\UserToRakLibThreadMessageSender; use raklib\server\ipc\UserToRakLibThreadMessageSender;
use raklib\server\ServerEventListener; use raklib\server\ServerEventListener;
@ -101,7 +100,6 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
$this->sleeper $this->sleeper
); );
$this->eventReceiver = new RakLibToUserThreadMessageReceiver( $this->eventReceiver = new RakLibToUserThreadMessageReceiver(
$this,
new PthreadsChannelReader($threadToMainBuffer) new PthreadsChannelReader($threadToMainBuffer)
); );
$this->interface = new UserToRakLibThreadMessageSender( $this->interface = new UserToRakLibThreadMessageSender(
@ -111,7 +109,7 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
public function start() : void{ public function start() : void{
$this->server->getTickSleeper()->addNotifier($this->sleeper, function() : void{ $this->server->getTickSleeper()->addNotifier($this->sleeper, function() : void{
while($this->eventReceiver->handle()); while($this->eventReceiver->handle($this));
}); });
$this->server->getLogger()->debug("Waiting for RakLib to start..."); $this->server->getLogger()->debug("Waiting for RakLib to start...");
$this->rakLib->startAndWait(PTHREADS_INHERIT_CONSTANTS); //HACK: MainLogger needs constants for exception logging $this->rakLib->startAndWait(PTHREADS_INHERIT_CONSTANTS); //HACK: MainLogger needs constants for exception logging
@ -250,7 +248,7 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
$pk->reliability = PacketReliability::RELIABLE_ORDERED; $pk->reliability = PacketReliability::RELIABLE_ORDERED;
$pk->orderChannel = 0; $pk->orderChannel = 0;
$this->interface->sendEncapsulated($sessionId, $pk, ($immediate ? RakLib::PRIORITY_IMMEDIATE : RakLib::PRIORITY_NORMAL)); $this->interface->sendEncapsulated($sessionId, $pk, $immediate);
} }
} }