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

Added Recursive class loading in FolderPluginLoader

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-03-28 04:25:17 +01:00
parent a7269c7900
commit b59926bece
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/PocketMine/PocketMine.php
View File

@ -96,17 +96,6 @@ namespace PocketMine {
if(file_exists($fPath)){ if(file_exists($fPath)){
require_once($fPath); require_once($fPath);
} }
}else{ //Try plugin
$className = array_pop($path);
if(count($path) > 0){
$path = implode(DIRECTORY_SEPARATOR, array_map("strtolower", $path)) . DIRECTORY_SEPARATOR;
}else{
$path = "";
}
$fPath = \PocketMine\PATH . "plugins" . DIRECTORY_SEPARATOR . $parent . DIRECTORY_SEPARATOR . "src" . DIRECTORY_SEPARATOR . $path . $className . ".php";
if(file_exists($fPath)){
require_once($fPath);
}
} }
}); });

6
src/PocketMine/plugin/FolderPluginLoader.php
View File

@ -59,6 +59,12 @@ class FolderPluginLoader implements PluginLoader{
return null; return null;
} }
foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($file . "/src/")) as $fName){
if(strtolower(substr($fName, -4)) === ".php"){
include_once($fName);
}
}
$className = $description->getMain(); $className = $description->getMain();
if(class_exists($className, true)){ //call autoloader, TODO: replace this with a specific Plugin autoload if(class_exists($className, true)){ //call autoloader, TODO: replace this with a specific Plugin autoload
$plugin = new $className(); $plugin = new $className();