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

Load later plugins with custom loader, fixes API

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-08-16 00:30:37 +02:00
parent 9e74169d74
commit 918024e466
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/plugin/PluginManager.php
View File

@ -136,12 +136,13 @@ class PluginManager{
}
/**
* @param string $path
* @param string $path
* @param PluginLoader[] $loaders
*
* @return Plugin
*/
public function loadPlugin($path){
foreach($this->fileAssociations as $loader){
public function loadPlugin($path, $loaders = null){
foreach(($loaders === null ? $this->fileAssociations : $loaders) as $loader){
if(preg_match($loader->getPluginFilters(), basename($path)) > 0){
$description = $loader->getPluginDescription($path);
if($description instanceof PluginDescription){
@ -285,7 +286,7 @@ class PluginManager{
if(!isset($dependencies[$name]) and !isset($softDependencies[$name])){
unset($plugins[$name]);
$missingDependency = false;
if($plugin = $this->loadPlugin($file) and $plugin instanceof Plugin){
if($plugin = $this->loadPlugin($file, $loaders) and $plugin instanceof Plugin){
$loadedPlugins[$name] = $plugin;
}else{
$this->server->getLogger()->critical("Could not load plugin '" . $name . "'");
@ -299,7 +300,7 @@ class PluginManager{
unset($softDependencies[$name]);
unset($plugins[$name]);
$missingDependency = false;
if($plugin = $this->loadPlugin($file) and $plugin instanceof Plugin){
if($plugin = $this->loadPlugin($file, $loaders) and $plugin instanceof Plugin){
$loadedPlugins[$name] = $plugin;
}else{
$this->server->getLogger()->critical("Could not load plugin '" . $name . "'");