Merge branch 'stable' into next-minor

This commit is contained in:
Dylan K. Taylor 2021-12-27 21:55:13 +00:00
commit 767dfd9947
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 5 additions and 3 deletions

View File

@ -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);
}
} }
) )
); );

View File

@ -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