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

Installer: No need for force-kills

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-01-31 12:05:56 +00:00
parent eb1ec2df05
commit 82cf38d46c
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/PocketMine.php
View File

@ -479,10 +479,17 @@ namespace pocketmine {
@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
new Installer();
$installer = new Installer();
if(!$installer->run()){
$logger->shutdown();
$logger->join();
exit(-1);
}
}
if(\Phar::running(true) === ""){
$logger->warning("Non-packaged PocketMine-MP installation detected, do not use on production.");
}
@ -496,7 +503,6 @@ namespace pocketmine {
$killer->start();
$erroredThreads = 0;
foreach(ThreadManager::getInstance()->getAll() as $id => $thread){
$logger->debug("Stopping " . $thread->getThreadName() . " thread");
try{