Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor 2020-02-07 20:18:17 +00:00
commit 347b94b284
3 changed files with 22 additions and 5 deletions

View File

@ -60,14 +60,26 @@ use function min;
* Manages block registration and instance creation
*/
class BlockFactory{
/** @var \SplFixedArray|Block[] */
/**
* @var \SplFixedArray|Block[]
* @phpstan-var \SplFixedArray<Block>
*/
private static $fullList;
/** @var \SplFixedArray|int[] */
/**
* @var \SplFixedArray|int[]
* @phpstan-var \SplFixedArray<int>
*/
public static $lightFilter;
/** @var \SplFixedArray|bool[] */
/**
* @var \SplFixedArray|bool[]
* @phpstan-var \SplFixedArray<bool>
*/
public static $diffusesSkyLight;
/** @var \SplFixedArray|float[] */
/**
* @var \SplFixedArray|float[]
* @phpstan-var \SplFixedArray<float>
*/
public static $blastResistance;
/**

View File

@ -512,7 +512,7 @@ class PluginManager{
}
/**
* @param string $event Class name that extends Event
* @param string $event Class name that extends Event
*
* @phpstan-template TEvent of Event
* @phpstan-param class-string<TEvent> $event

View File

@ -17,6 +17,11 @@ parameters:
count: 1
path: ../../../src/plugin/PluginBase.php
-
message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<pocketmine\\\\event\\\\Event\\> and 'pocketmine\\\\\\\\event…' will always evaluate to true\\.$#"
count: 1
path: ../../../src/plugin/PluginManager.php
-
#::add() / ::remove() thread parameter
message: "#^If condition is always true\\.$#"