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

PocketMine.php: remove \pocketmine\DATA dynamic constant

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-08-25 16:55:24 +01:00
parent 51ed564c5e
commit 40da5059c9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/PocketMine.php
View File

@ -194,21 +194,21 @@ namespace pocketmine {
$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-ansi", "disable-ansi"]); $opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-ansi", "disable-ansi"]);
define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR); $dataPath = isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR;
define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR); define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : realpath(getcwd()) . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
if(!file_exists(\pocketmine\DATA)){ if(!file_exists($dataPath)){
mkdir(\pocketmine\DATA, 0777, true); mkdir($dataPath, 0777, true);
} }
define('pocketmine\LOCK_FILE_PATH', \pocketmine\DATA . 'server.lock'); define('pocketmine\LOCK_FILE_PATH', $dataPath . 'server.lock');
define('pocketmine\LOCK_FILE', fopen(\pocketmine\LOCK_FILE_PATH, "a+b")); define('pocketmine\LOCK_FILE', fopen(\pocketmine\LOCK_FILE_PATH, "a+b"));
if(!flock(\pocketmine\LOCK_FILE, LOCK_EX | LOCK_NB)){ if(!flock(\pocketmine\LOCK_FILE, LOCK_EX | LOCK_NB)){
//wait for a shared lock to avoid race conditions if two servers started at the same time - this makes sure the //wait for a shared lock to avoid race conditions if two servers started at the same time - this makes sure the
//other server wrote its PID and released exclusive lock before we get our lock //other server wrote its PID and released exclusive lock before we get our lock
flock(\pocketmine\LOCK_FILE, LOCK_SH); flock(\pocketmine\LOCK_FILE, LOCK_SH);
$pid = stream_get_contents(\pocketmine\LOCK_FILE); $pid = stream_get_contents(\pocketmine\LOCK_FILE);
critical_error("Another " . \pocketmine\NAME . " instance (PID $pid) is already using this folder (" . realpath(\pocketmine\DATA) . ")."); critical_error("Another " . \pocketmine\NAME . " instance (PID $pid) is already using this folder (" . realpath($dataPath) . ").");
critical_error("Please stop the other server first before running a new one."); critical_error("Please stop the other server first before running a new one.");
exit(1); exit(1);
} }
@ -228,7 +228,7 @@ namespace pocketmine {
Terminal::init(); Terminal::init();
} }
$logger = new MainLogger(\pocketmine\DATA . "server.log"); $logger = new MainLogger($dataPath . "server.log");
\GlobalLogger::set($logger); \GlobalLogger::set($logger);
emit_performance_warnings($logger); emit_performance_warnings($logger);
@ -261,8 +261,8 @@ namespace pocketmine {
$exitCode = 0; $exitCode = 0;
do{ do{
if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){ if(!file_exists($dataPath . "server.properties") and !isset($opts["no-wizard"])){
$installer = new SetupWizard(\pocketmine\DATA); $installer = new SetupWizard($dataPath);
if(!$installer->run()){ if(!$installer->run()){
$exitCode = -1; $exitCode = -1;
break; break;
@ -270,7 +270,7 @@ namespace pocketmine {
} }
ThreadManager::init(); ThreadManager::init();
new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH); new Server($autoloader, $logger, $dataPath, \pocketmine\PLUGIN_PATH);
$logger->info("Stopping other threads"); $logger->info("Stopping other threads");