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

Merge commit '799183e13e61e89cc6820ad3132a4147454017c6'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/level/format/io/LevelProviderManager.php
#	src/pocketmine/tile/Tile.php
#	src/world/generator/GeneratorManager.php
This commit is contained in:
Dylan K. Taylor
2020-01-31 21:26:40 +00:00
parent cb16f5c142 799183e13e
commit f65bf76fd8
6 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugin/PluginManager.php
View File

@ -73,7 +73,10 @@ class PluginManager{
/** @var Plugin[] */
protected $enabledPlugins = [];
/** @var PluginLoader[] */
/**
* @var PluginLoader[]
* @phpstan-var array<class-string<PluginLoader>, PluginLoader>
*/
protected $fileAssociations = [];
/** @var string|null */
@ -176,6 +179,7 @@ class PluginManager{
/**
* @param string[]|null $newLoaders
* @phpstan-param list<class-string<PluginLoader>> $newLoaders
*
* @return Plugin[]
*/