diff --git a/src/network/mcpe/raklib/RakLibInterface.php b/src/network/mcpe/raklib/RakLibInterface.php index fcac5fb38..0906390d1 100644 --- a/src/network/mcpe/raklib/RakLibInterface.php +++ b/src/network/mcpe/raklib/RakLibInterface.php @@ -34,7 +34,6 @@ use pocketmine\utils\Filesystem; use pocketmine\utils\Utils; use raklib\protocol\EncapsulatedPacket; use raklib\protocol\PacketReliability; -use raklib\RakLib; use raklib\server\ipc\RakLibToUserThreadMessageReceiver; use raklib\server\ipc\UserToRakLibThreadMessageSender; use raklib\server\ServerEventListener; @@ -101,7 +100,6 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{ $this->sleeper ); $this->eventReceiver = new RakLibToUserThreadMessageReceiver( - $this, new PthreadsChannelReader($threadToMainBuffer) ); $this->interface = new UserToRakLibThreadMessageSender( @@ -111,7 +109,7 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{ public function start() : 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->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->orderChannel = 0; - $this->interface->sendEncapsulated($sessionId, $pk, ($immediate ? RakLib::PRIORITY_IMMEDIATE : RakLib::PRIORITY_NORMAL)); + $this->interface->sendEncapsulated($sessionId, $pk, $immediate); } }