mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-06 01:51:51 +00:00
Code Issues Projects Releases Wiki Activity

Removed temporal pthreads workaround

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-11-28 13:01:25 +01:00
parent 3abf36ad07
commit d139e5f342
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/PocketMine.php
View File

@ -367,8 +367,8 @@ namespace pocketmine {
if(substr_count($pthreads_version, ".") < 2){ if(substr_count($pthreads_version, ".") < 2){
$pthreads_version = "0.$pthreads_version"; $pthreads_version = "0.$pthreads_version";
} }
if(version_compare($pthreads_version, "2.0.8") < 0){ if(version_compare($pthreads_version, "2.0.9") < 0){
$logger->critical("pthreads >= 2.0.8 is required, while you have $pthreads_version."); $logger->critical("pthreads >= 2.0.9 is required, while you have $pthreads_version.");
++$errors; ++$errors;
} }

7
src/pocketmine/Server.php
View File

@ -1615,13 +1615,6 @@ class Server{
Generator::addGenerator(Normal::class, "normal"); Generator::addGenerator(Normal::class, "normal");
Generator::addGenerator(Normal::class, "default"); 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){ foreach((array) $this->getProperty("worlds", []) as $name => $worldSetting){
if($this->loadLevel($name) === false){ if($this->loadLevel($name) === false){
$seed = $this->getProperty("worlds.$name.seed", time()); $seed = $this->getProperty("worlds.$name.seed", time());