From c569f559337e1ab3b4146c9bcb4f7757de1ea167 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 9 Sep 2017 11:22:44 +0100 Subject: [PATCH 1/2] Fixed can't find sources when PocketMine.php is run from anywhere other than the repository root --- src/pocketmine/PocketMine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 8165359e9..36d4278af 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -120,7 +120,7 @@ namespace pocketmine { if(\Phar::running(true) !== ""){ define('pocketmine\PATH', \Phar::running(true) . "/"); }else{ - define('pocketmine\PATH', realpath(getcwd()) . DIRECTORY_SEPARATOR); + define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR); } $requiredSplVer = "0.0.1"; From 17d949f476002ca85cae34c7280671afd15b4693 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 9 Sep 2017 11:25:59 +0100 Subject: [PATCH 2/2] Fixed SPL being reported as incompatible when it's actually not found --- src/pocketmine/PocketMine.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 36d4278af..b039ef2d4 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -124,18 +124,17 @@ namespace pocketmine { } $requiredSplVer = "0.0.1"; - if(!is_file(\pocketmine\PATH . "src/spl/version.php") or version_compare($requiredSplVer, require(\pocketmine\PATH . "src/spl/version.php")) > 0){ + if(!is_file(\pocketmine\PATH . "src/spl/version.php")){ + echo "[CRITICAL] Cannot find PocketMine-SPL or incompatible version." . PHP_EOL; + echo "[CRITICAL] Please update your submodules or use provided builds." . PHP_EOL; + exit(1); + }elseif(version_compare($requiredSplVer, require(\pocketmine\PATH . "src/spl/version.php")) > 0){ echo "[CRITICAL] Incompatible PocketMine-SPL submodule version ($requiredSplVer is required)." . PHP_EOL; echo "[CRITICAL] Please update your submodules or use provided builds." . PHP_EOL; exit(1); } if(!class_exists("ClassLoader", false)){ - if(!is_file(\pocketmine\PATH . "src/spl/ClassLoader.php")){ - echo "[CRITICAL] Unable to find the PocketMine-SPL library." . PHP_EOL; - echo "[CRITICAL] Please use provided builds or clone the repository recursively." . PHP_EOL; - exit(1); - } require_once(\pocketmine\PATH . "src/spl/ClassLoader.php"); require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php"); }