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

Level: properly define type of generator field

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-11-01 14:34:58 +00:00
parent deb0cee8a0
commit fec42f16ba
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/level/Level.php
View File

@ -53,7 +53,6 @@ use pocketmine\level\format\io\ChunkRequestTask;
use pocketmine\level\format\io\exception\CorruptedChunkException; use pocketmine\level\format\io\exception\CorruptedChunkException;
use pocketmine\level\format\io\exception\UnsupportedChunkFormatException; use pocketmine\level\format\io\exception\UnsupportedChunkFormatException;
use pocketmine\level\format\io\LevelProvider; use pocketmine\level\format\io\LevelProvider;
use pocketmine\level\generator\Generator;
use pocketmine\level\generator\GeneratorManager; use pocketmine\level\generator\GeneratorManager;
use pocketmine\level\generator\GeneratorRegisterTask; use pocketmine\level\generator\GeneratorRegisterTask;
use pocketmine\level\generator\GeneratorUnregisterTask; use pocketmine\level\generator\GeneratorUnregisterTask;
@ -289,7 +288,10 @@ class Level implements ChunkManager, Metadatable{
/** @var bool */ /** @var bool */
private $doingTick = false; private $doingTick = false;
/** @var string|Generator */ /**
* @var string
* @phpstan-var class-string<\pocketmine\level\generator\Generator>
*/
private $generator; private $generator;
/** @var bool */ /** @var bool */

6
src/pocketmine/level/generator/GeneratorRegisterTask.php
View File

@ -35,7 +35,10 @@ use function 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;
@ -48,6 +51,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(Level $level, string $generatorClass, array $generatorSettings = []){ public function __construct(Level $level, string $generatorClass, array $generatorSettings = []){

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

@ -565,11 +565,6 @@ parameters:
count: 1 count: 1
path: ../../../src/pocketmine/level/Explosion.php path: ../../../src/pocketmine/level/Explosion.php
-
message: "#^Parameter \\#2 \\$generatorClass of class pocketmine\\\\level\\\\generator\\\\GeneratorRegisterTask constructor expects string, pocketmine\\\\level\\\\generator\\\\Generator\\|string given\\.$#"
count: 1
path: ../../../src/pocketmine/level/Level.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