Merge branch 'master' into scheduler-nuke

# Conflicts:
#	src/pocketmine/level/Level.php
This commit is contained in:
Dylan K. Taylor
2018-05-31 10:40:10 +01:00
6 changed files with 15 additions and 20 deletions

View File

@ -33,7 +33,7 @@ class AsyncWorker extends Worker{
/** @var int */
private $memoryLimit;
public function __construct(\AttachableThreadedLogger $logger, int $id, int $memoryLimit){
public function __construct(\ThreadedLogger $logger, int $id, int $memoryLimit){
$this->logger = $logger;
$this->id = $id;
$this->memoryLimit = $memoryLimit;