mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-03 00:29:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/level/Level.php
#	src/pocketmine/level/format/Chunk.php
#	tests/phpstan/configs/l7-baseline.neon
This commit is contained in:
Dylan K. Taylor 2020-11-01 15:58:16 +00:00
commit 1d551af54a
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/world/World.php
View File

@ -67,7 +67,6 @@ use pocketmine\world\biome\Biome;
use pocketmine\world\format\Chunk; use pocketmine\world\format\Chunk;
use pocketmine\world\format\io\exception\CorruptedChunkException; use pocketmine\world\format\io\exception\CorruptedChunkException;
use pocketmine\world\format\io\WritableWorldProvider; use pocketmine\world\format\io\WritableWorldProvider;
use pocketmine\world\generator\Generator;
use pocketmine\world\generator\GeneratorManager; use pocketmine\world\generator\GeneratorManager;
use pocketmine\world\generator\GeneratorRegisterTask; use pocketmine\world\generator\GeneratorRegisterTask;
use pocketmine\world\generator\GeneratorUnregisterTask; use pocketmine\world\generator\GeneratorUnregisterTask;
@ -105,6 +104,7 @@ use function mt_rand;
use function spl_object_id; use function spl_object_id;
use function strtolower; use function strtolower;
use function trim; use function trim;
use function var_dump;
use const M_PI; use const M_PI;
use const PHP_INT_MAX; use const PHP_INT_MAX;
use const PHP_INT_MIN; use const PHP_INT_MIN;
@ -253,7 +253,10 @@ class World implements ChunkManager{
/** @var bool */ /** @var bool */
private $doingTick = false; private $doingTick = false;
/** @var string|Generator */ /**
* @var string
* @phpstan-var class-string<\pocketmine\world\generator\Generator>
*/
private $generator; private $generator;
/** @var bool */ /** @var bool */

1
src/world/format/io/FastChunkSerializer.php
View File

@ -151,6 +151,7 @@ final class FastChunkSerializer{
$chunk->setGenerated($terrainGenerated); $chunk->setGenerated($terrainGenerated);
$chunk->setPopulated($terrainPopulated); $chunk->setPopulated($terrainPopulated);
$chunk->setLightPopulated($lightPopulated); $chunk->setLightPopulated($lightPopulated);
$chunk->clearDirtyFlags();
return $chunk; return $chunk;
} }

6
src/world/generator/GeneratorRegisterTask.php
View File

@ -32,7 +32,10 @@ use function igbinary_unserialize;
class GeneratorRegisterTask extends AsyncTask{ class GeneratorRegisterTask extends AsyncTask{
/** @var string */ /**
* @var string
* @phpstan-var class-string<Generator>
*/
public $generatorClass; public $generatorClass;
/** @var string */ /** @var string */
public $settings; public $settings;
@ -45,6 +48,7 @@ class GeneratorRegisterTask extends AsyncTask{
/** /**
* @param mixed[] $generatorSettings * @param mixed[] $generatorSettings
* @phpstan-param class-string<Generator> $generatorClass
* @phpstan-param array<string, mixed> $generatorSettings * @phpstan-param array<string, mixed> $generatorSettings
*/ */
public function __construct(World $world, string $generatorClass, array $generatorSettings = []){ public function __construct(World $world, string $generatorClass, array $generatorSettings = []){

5
tests/phpstan/configs/l7-baseline.neon
View File

@ -850,11 +850,6 @@ parameters:
count: 1 count: 1
path: ../../../src/world/Explosion.php path: ../../../src/world/Explosion.php
-
message: "#^Parameter \\#2 \\$generatorClass of class pocketmine\\\\world\\\\generator\\\\GeneratorRegisterTask constructor expects string, pocketmine\\\\world\\\\generator\\\\Generator\\|string given\\.$#"
count: 1
path: ../../../src/world/World.php
- -
message: "#^Cannot access offset 'priority' on array\\('priority' \\=\\> int, 'data' \\=\\> pocketmine\\\\math\\\\Vector3\\)\\|int\\|pocketmine\\\\math\\\\Vector3\\.$#" message: "#^Cannot access offset 'priority' on array\\('priority' \\=\\> int, 'data' \\=\\> pocketmine\\\\math\\\\Vector3\\)\\|int\\|pocketmine\\\\math\\\\Vector3\\.$#"
count: 1 count: 1