diff --git a/changelogs/3.26.md b/changelogs/3.26.md index 9ee4332c0..323c49c74 100644 --- a/changelogs/3.26.md +++ b/changelogs/3.26.md @@ -9,3 +9,6 @@ Plugin developers should **only** update their required API to this version if y # 3.26.0 - Added support for Minecraft: Bedrock Edition 1.18.0. - Removed compatibility with earlier versions. + +# 3.26.1 +- Fixed a bug in chunk sending that caused double chests to not be paired, signs to be blank, and various other issues. diff --git a/start.cmd b/start.cmd index 929e5f7bb..747716ff8 100644 --- a/start.cmd +++ b/start.cmd @@ -2,11 +2,24 @@ TITLE PocketMine-MP server software for Minecraft: Bedrock Edition cd /d %~dp0 +set PHP_BINARY= + +where /q php.exe +if %ERRORLEVEL%==0 ( + set PHP_BINARY=php +) + if exist bin\php\php.exe ( + rem always use the local PHP binary if it exists set PHPRC="" set PHP_BINARY=bin\php\php.exe -) else ( - set PHP_BINARY=php +) + +if "%PHP_BINARY%"=="" ( + echo Couldn't find a PHP binary in system PATH or %~dp0\bin\php + echo Please refer to the installation instructions at https://doc.pmmp.io/en/rtfd/installation.html + pause + exit 1 ) if exist PocketMine-MP.phar ( diff --git a/start.ps1 b/start.ps1 index 2528dd691..19b2a6158 100644 --- a/start.ps1 +++ b/start.ps1 @@ -11,8 +11,13 @@ if($php -ne ""){ }elseif(Test-Path "bin\php\php.exe"){ $env:PHPRC = "" $binary = "bin\php\php.exe" -}else{ +}elseif((Get-Command php -ErrorAction SilentlyContinue)){ $binary = "php" +}else{ + echo "Couldn't find a PHP binary in system PATH or $pwd\bin\php" + echo "Please refer to the installation instructions at https://doc.pmmp.io/en/rtfd/installation.html" + pause + exit 1 } if($file -eq ""){ diff --git a/start.sh b/start.sh index 087b53db8..63a9a273b 100755 --- a/start.sh +++ b/start.sh @@ -23,10 +23,11 @@ if [ "$PHP_BINARY" == "" ]; then if [ -f ./bin/php7/bin/php ]; then export PHPRC="" PHP_BINARY="./bin/php7/bin/php" - elif [[ ! -z $(type php) ]]; then + elif [[ ! -z $(type php 2> /dev/null) ]]; then PHP_BINARY=$(type -p php) else - echo "Couldn't find a working PHP binary, please use the installer." + echo "Couldn't find a PHP binary in system PATH or $PWD/bin/php7/bin" + echo "Please refer to the installation instructions at https://doc.pmmp.io/en/rtfd/installation.html" exit 1 fi fi