Merge branch 'stable'

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.

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 (

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 ""){

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