Merge branch 'release/3.3' into release/3.4

This commit is contained in:
Dylan K. Taylor 2018-11-13 18:24:08 +00:00
commit 554c029fbd
3 changed files with 6 additions and 3 deletions

View File

@ -12,7 +12,8 @@ if exist bin\php\php.exe (
if exist PocketMine-MP.phar ( if exist PocketMine-MP.phar (
set POCKETMINE_FILE=PocketMine-MP.phar set POCKETMINE_FILE=PocketMine-MP.phar
) else ( ) else (
echo Couldn't find a valid PocketMine-MP installation echo PocketMine-MP.phar not found
echo Downloads can be found at https://github.com/pmmp/PocketMine-MP/releases
pause pause
exit 1 exit 1
) )

View File

@ -19,7 +19,8 @@ if($file -eq ""){
if(Test-Path "PocketMine-MP.phar"){ if(Test-Path "PocketMine-MP.phar"){
$file = "PocketMine-MP.phar" $file = "PocketMine-MP.phar"
}else{ }else{
echo "Couldn't find a valid PocketMine-MP installation" echo "PocketMine-MP.phar not found"
echo "Downloads can be found at https://github.com/pmmp/PocketMine-MP/releases"
pause pause
exit 1 exit 1
} }

View File

@ -37,7 +37,8 @@ if [ "$POCKETMINE_FILE" == "" ]; then
if [ -f ./PocketMine-MP.phar ]; then if [ -f ./PocketMine-MP.phar ]; then
POCKETMINE_FILE="./PocketMine-MP.phar" POCKETMINE_FILE="./PocketMine-MP.phar"
else else
echo "Couldn't find a valid PocketMine-MP installation" echo "PocketMine-MP.phar not found"
echo "Downloads can be found at https://github.com/pmmp/PocketMine-MP/releases"
exit 1 exit 1
fi fi
fi fi