diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 745ad41f9..1dea85d2e 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -263,7 +263,6 @@ namespace pocketmine { //TODO: move this to a Server field define('pocketmine\START_TIME', microtime(true)); - ThreadManager::init(); /* * We now use the Composer autoloader, but this autoloader is still for loading plugins. diff --git a/src/pocketmine/ThreadManager.php b/src/pocketmine/ThreadManager.php index 4d232c3fa..20c068b94 100644 --- a/src/pocketmine/ThreadManager.php +++ b/src/pocketmine/ThreadManager.php @@ -28,10 +28,11 @@ use function spl_object_hash; class ThreadManager extends \Volatile{ - /** @var ThreadManager */ + /** @var ThreadManager|null */ private static $instance = null; /** + * @deprecated * @return void */ public static function init(){ @@ -42,6 +43,9 @@ class ThreadManager extends \Volatile{ * @return ThreadManager */ public static function getInstance(){ + if(self::$instance === null){ + self::$instance = new ThreadManager(); + } return self::$instance; }