From 07c1ed1c368f3eb2a836bf3a2462b5f0bd8c8d9c Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Fri, 18 Jul 2014 10:49:38 +0200 Subject: [PATCH] Moved pthreads check before its usage --- src/pocketmine/PocketMine.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index fd692e07a..134f57ebc 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -85,6 +85,12 @@ namespace pocketmine { @define("pocketmine\\PATH", \getcwd() . DIRECTORY_SEPARATOR); } + if(!extension_loaded("pthreads")){ + echo "[CRITICAL] Unable to find the pthreads extension." . PHP_EOL; + echo "[CRITICAL] Please use the installer provided on the homepage.". PHP_EOL; + exit(1); + } + if(!class_exists("SplClassLoader", false)){ require_once(\pocketmine\PATH . "src/spl/SplClassLoader.php"); } @@ -235,18 +241,13 @@ namespace pocketmine { ++$errors; } - if(!extension_loaded("pthreads")){ - $logger->critical("Unable to find the pthreads extension."); + $pthreads_version = phpversion("pthreads"); + if(substr_count($pthreads_version, ".") < 2){ + $pthreads_version = "0.$pthreads_version"; + } + if(version_compare($pthreads_version, "2.0.4") < 0){ + $logger->critical("pthreads >= 2.0.4 is required, while you have $pthreads_version."); ++$errors; - }else{ - $pthreads_version = phpversion("pthreads"); - if(substr_count($pthreads_version, ".") < 2){ - $pthreads_version = "0.$pthreads_version"; - } - if(version_compare($pthreads_version, "2.0.4") < 0){ - $logger->critical("pthreads >= 2.0.4 is required, while you have $pthreads_version."); - ++$errors; - } } if(!extension_loaded("uopz")){