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

Merge remote-tracking branch 'origin/release/3.2' into release/3.3

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-11-04 23:32:33 +00:00
commit 2183bf875c
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start.cmd
View File

@ -12,13 +12,9 @@ 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 (
if exist src\pocketmine\PocketMine.php (
set POCKETMINE_FILE=src\pocketmine\PocketMine.php
) else (
echo Couldn't find a valid PocketMine-MP installation echo Couldn't find a valid PocketMine-MP installation
pause pause
exit 1 exit 1
)
) )
if exist bin\mintty.exe ( if exist bin\mintty.exe (

2
start.ps1
View File

@ -18,8 +18,6 @@ if($php -ne ""){
if($file -eq ""){ if($file -eq ""){
if(Test-Path "PocketMine-MP.phar"){ if(Test-Path "PocketMine-MP.phar"){
$file = "PocketMine-MP.phar" $file = "PocketMine-MP.phar"
}elseif(Test-Path "src\pocketmine\PocketMine.php"){
$file = "src\pocketmine\PocketMine.php"
}else{ }else{
echo "Couldn't find a valid PocketMine-MP installation" echo "Couldn't find a valid PocketMine-MP installation"
pause pause

2
start.sh
View File

@ -36,8 +36,6 @@ fi
if [ "$POCKETMINE_FILE" == "" ]; then 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"
elif [ -f ./src/pocketmine/PocketMine.php ]; then
POCKETMINE_FILE="./src/pocketmine/PocketMine.php"
else else
echo "Couldn't find a valid PocketMine-MP installation" echo "Couldn't find a valid PocketMine-MP installation"
exit 1 exit 1