From d139e5f3427a25e0cae1f2759586ae7a8c19d4be Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Fri, 28 Nov 2014 13:01:25 +0100 Subject: [PATCH] Removed temporal pthreads workaround --- src/pocketmine/PocketMine.php | 4 ++-- src/pocketmine/Server.php | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 08a179ef6..0e440027d 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -367,8 +367,8 @@ namespace pocketmine { if(substr_count($pthreads_version, ".") < 2){ $pthreads_version = "0.$pthreads_version"; } - if(version_compare($pthreads_version, "2.0.8") < 0){ - $logger->critical("pthreads >= 2.0.8 is required, while you have $pthreads_version."); + if(version_compare($pthreads_version, "2.0.9") < 0){ + $logger->critical("pthreads >= 2.0.9 is required, while you have $pthreads_version."); ++$errors; } diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 5ccc05fdd..d3841d570 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -1615,13 +1615,6 @@ class Server{ Generator::addGenerator(Normal::class, "normal"); Generator::addGenerator(Normal::class, "default"); - //Temporal workaround, pthreads static property nullification test - if(PluginManager::$pluginParentTimer === null or Timings::$serverTickTimer === null){ - $this->getLogger()->emergency("You are using an invalid pthreads version. Please update your binaries."); - kill(getmypid()); - return; - } - foreach((array) $this->getProperty("worlds", []) as $name => $worldSetting){ if($this->loadLevel($name) === false){ $seed = $this->getProperty("worlds.$name.seed", time());