mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-08 20:58:34 +00:00
Merge branch 'stable' into next-minor
This commit is contained in:
commit
767dfd9947
6
src/network/mcpe/cache/ChunkCache.php
vendored
6
src/network/mcpe/cache/ChunkCache.php
vendored
@ -128,10 +128,12 @@ class ChunkCache implements ChunkListener{
|
|||||||
$chunk,
|
$chunk,
|
||||||
$this->caches[$chunkHash],
|
$this->caches[$chunkHash],
|
||||||
$this->compressor,
|
$this->compressor,
|
||||||
function() use ($chunkX, $chunkZ) : void{
|
function() use ($chunkHash, $chunkX, $chunkZ) : void{
|
||||||
$this->world->getLogger()->error("Failed preparing chunk $chunkX $chunkZ, retrying");
|
$this->world->getLogger()->error("Failed preparing chunk $chunkX $chunkZ, retrying");
|
||||||
|
|
||||||
$this->restartPendingRequest($chunkX, $chunkZ);
|
if(isset($this->caches[$chunkHash])){
|
||||||
|
$this->restartPendingRequest($chunkX, $chunkZ);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
@ -16,7 +16,7 @@ if exist bin\php\php.exe (
|
|||||||
)
|
)
|
||||||
|
|
||||||
if "%PHP_BINARY%"=="" (
|
if "%PHP_BINARY%"=="" (
|
||||||
echo Couldn't find a PHP binary in system PATH or %~dp0\bin\php
|
echo Couldn't find a PHP binary in system PATH or "%~dp0bin\php"
|
||||||
echo Please refer to the installation instructions at https://doc.pmmp.io/en/rtfd/installation.html
|
echo Please refer to the installation instructions at https://doc.pmmp.io/en/rtfd/installation.html
|
||||||
pause
|
pause
|
||||||
exit 1
|
exit 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user