Merge branch 'release/3.3'

This commit is contained in:
Dylan K. Taylor 2018-09-20 17:05:01 +01:00
commit eab7424955

View File

@ -149,11 +149,11 @@ namespace pocketmine {
$opts = getopt("", ["bootstrap:"]); $opts = getopt("", ["bootstrap:"]);
if(isset($opts["bootstrap"])){ if(isset($opts["bootstrap"])){
$bootstrap = $opts["bootstrap"]; $bootstrap = realpath($opts["bootstrap"]) ?: $opts["bootstrap"];
}else{ }else{
$bootstrap = \pocketmine\PATH . 'vendor/autoload.php'; $bootstrap = \pocketmine\PATH . 'vendor/autoload.php';
} }
define('pocketmine\COMPOSER_AUTOLOADER_PATH', realpath($bootstrap)); define('pocketmine\COMPOSER_AUTOLOADER_PATH', $bootstrap);
if(\pocketmine\COMPOSER_AUTOLOADER_PATH !== false and is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){ if(\pocketmine\COMPOSER_AUTOLOADER_PATH !== false and is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH); require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);