Merge changes from master

This commit is contained in:
Dylan K. Taylor
2017-05-24 09:54:11 +01:00
10 changed files with 67 additions and 38 deletions

View File

@ -498,6 +498,7 @@ namespace pocketmine {
$killer = new ServerKiller(8);
$killer->start();
usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
$erroredThreads = 0;
foreach(ThreadManager::getInstance()->getAll() as $id => $thread){