mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +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
parent 2684ee96f7 6cff08cd65
commit 1d551af54a
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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