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

Merge commit '763c8ebfe3bb8a597768d86040fee130c8fc7ab8'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Worker.php
#	src/thread/CommonThreadPartsTrait.php
This commit is contained in:
Dylan K. Taylor 2020-06-26 18:46:01 +01:00
commit abe4f1bf25
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/thread/Thread.php
View File

@ -31,7 +31,7 @@ use const PTHREADS_INHERIT_ALL;
abstract class Thread extends \Thread{ abstract class Thread extends \Thread{
use CommonThreadPartsTrait; use CommonThreadPartsTrait;
public function start(?int $options = PTHREADS_INHERIT_ALL) : bool{ public function start(int $options = PTHREADS_INHERIT_ALL) : bool{
//this is intentionally not traitified //this is intentionally not traitified
ThreadManager::getInstance()->add($this); ThreadManager::getInstance()->add($this);

2
src/thread/Worker.php
View File

@ -31,7 +31,7 @@ use const PTHREADS_INHERIT_ALL;
abstract class Worker extends \Worker{ abstract class Worker extends \Worker{
use CommonThreadPartsTrait; use CommonThreadPartsTrait;
public function start(?int $options = PTHREADS_INHERIT_ALL) : bool{ public function start(int $options = PTHREADS_INHERIT_ALL) : bool{
//this is intentionally not traitified //this is intentionally not traitified
ThreadManager::getInstance()->add($this); ThreadManager::getInstance()->add($this);