mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-04-21 00:07:30 +00:00
Merge remote-tracking branch 'origin/release/3.2' into release/3.3
This commit is contained in:
commit
2183bf875c
10
start.cmd
10
start.cmd
@ -12,13 +12,9 @@ if exist bin\php\php.exe (
|
||||
if exist PocketMine-MP.phar (
|
||||
set POCKETMINE_FILE=PocketMine-MP.phar
|
||||
) else (
|
||||
if exist src\pocketmine\PocketMine.php (
|
||||
set POCKETMINE_FILE=src\pocketmine\PocketMine.php
|
||||
) else (
|
||||
echo Couldn't find a valid PocketMine-MP installation
|
||||
pause
|
||||
exit 1
|
||||
)
|
||||
echo Couldn't find a valid PocketMine-MP installation
|
||||
pause
|
||||
exit 1
|
||||
)
|
||||
|
||||
if exist bin\mintty.exe (
|
||||
|
@ -18,8 +18,6 @@ if($php -ne ""){
|
||||
if($file -eq ""){
|
||||
if(Test-Path "PocketMine-MP.phar"){
|
||||
$file = "PocketMine-MP.phar"
|
||||
}elseif(Test-Path "src\pocketmine\PocketMine.php"){
|
||||
$file = "src\pocketmine\PocketMine.php"
|
||||
}else{
|
||||
echo "Couldn't find a valid PocketMine-MP installation"
|
||||
pause
|
||||
|
2
start.sh
2
start.sh
@ -36,8 +36,6 @@ fi
|
||||
if [ "$POCKETMINE_FILE" == "" ]; then
|
||||
if [ -f ./PocketMine-MP.phar ]; then
|
||||
POCKETMINE_FILE="./PocketMine-MP.phar"
|
||||
elif [ -f ./src/pocketmine/PocketMine.php ]; then
|
||||
POCKETMINE_FILE="./src/pocketmine/PocketMine.php"
|
||||
else
|
||||
echo "Couldn't find a valid PocketMine-MP installation"
|
||||
exit 1
|
||||
|
Loading…
x
Reference in New Issue
Block a user