mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 08:49:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'd94995e161d71659e2fe6ec1df47621f2de4b494'

Browse Source 
# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-01-31 19:46:28 +00:00
commit 19a6fb35e7
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugin/PluginDescription.php
View File

@ -77,13 +77,14 @@ class PluginDescription{
private $permissions = []; private $permissions = [];
/** /**
* @param string|array $yamlString * @param string|mixed[] $yamlString
*/ */
public function __construct($yamlString){ public function __construct($yamlString){
$this->loadMap(!is_array($yamlString) ? yaml_parse($yamlString) : $yamlString); $this->loadMap(!is_array($yamlString) ? yaml_parse($yamlString) : $yamlString);
} }
/** /**
* @param mixed[] $plugin
* @throws PluginException * @throws PluginException
*/ */
private function loadMap(array $plugin) : void{ private function loadMap(array $plugin) : void{
@ -161,6 +162,9 @@ class PluginDescription{
return $this->name . " v" . $this->version; return $this->name . " v" . $this->version;
} }
/**
* @return string[]
*/
public function getCompatibleApis() : array{ public function getCompatibleApis() : array{
return $this->api; return $this->api;
} }
@ -183,6 +187,9 @@ class PluginDescription{
return $this->prefix; return $this->prefix;
} }
/**
* @return mixed[][]
*/
public function getCommands() : array{ public function getCommands() : array{
return $this->commands; return $this->commands;
} }
@ -228,6 +235,9 @@ class PluginDescription{
} }
} }
/**
* @return string[]
*/
public function getDepend() : array{ public function getDepend() : array{
return $this->depend; return $this->depend;
} }
@ -236,6 +246,9 @@ class PluginDescription{
return $this->description; return $this->description;
} }
/**
* @return string[]
*/
public function getLoadBefore() : array{ public function getLoadBefore() : array{
return $this->loadBefore; return $this->loadBefore;
} }
@ -259,6 +272,9 @@ class PluginDescription{
return $this->permissions; return $this->permissions;
} }
/**
* @return string[]
*/
public function getSoftDepend() : array{ public function getSoftDepend() : array{
return $this->softDepend; return $this->softDepend;
} }
@ -271,6 +287,9 @@ class PluginDescription{
return $this->website; return $this->website;
} }
/**
* @return mixed[]
*/
public function getMap() : array{ public function getMap() : array{
return $this->map; return $this->map;
} }

2
src/plugin/PluginManager.php
View File

@ -175,6 +175,8 @@ class PluginManager{
} }
/** /**
* @param string[]|null $newLoaders
*
* @return Plugin[] * @return Plugin[]
*/ */
public function loadPlugins(string $directory, ?array $newLoaders = null) : array{ public function loadPlugins(string $directory, ?array $newLoaders = null) : array{