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

Merge branch 'release/3.3'

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-09-04 15:58:24 +01:00
parent 034472bfe7 557fd34754
commit 99fb267333
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
}
public function start() : void{
$this->rakLib->start(PTHREADS_INHERIT_CONSTANTS | PTHREADS_INHERIT_INI); //HACK: MainLogger needs INI and constants
$this->rakLib->start(PTHREADS_INHERIT_CONSTANTS); //HACK: MainLogger needs constants for exception logging
}
public function setNetwork(Network $network) : void{

2
src/pocketmine/network/rcon/RCONInstance.php
View File

@ -68,7 +68,7 @@ class RCONInstance extends Thread{
$this->ipcSocket = $ipcSocket;
$this->notifier = $notifier;
$this->start(PTHREADS_INHERIT_INI); //HACK: need INI for timezone (logger)
$this->start(PTHREADS_INHERIT_NONE);
}
private function writePacket($client, int $requestID, int $packetType, string $payload){