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

Improved plugin loading

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-04-04 22:11:31 +02:00
parent adcbc67a71
commit 0d91be62cf
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/plugin/PharPluginLoader.php
View File

@ -58,7 +58,7 @@ class PharPluginLoader implements PluginLoader{
} }
$file = "phar://$file"; $file = "phar://$file";
$className = $description->getMain(); $className = $description->getMain();
$this->server->getLoader()->add(substr($className, 0, strpos($className, "\\")), array( $this->server->getLoader()->add(substr($className, 0, strrpos($className, "\\")), array(
"$file/src" "$file/src"
)); ));

8
src/spl/SplClassLoader.php
View File

@ -122,8 +122,16 @@ class SplClassLoader implements SplAutoloader{
* {@inheritdoc} * {@inheritdoc}
*/ */
public function add($resource, $resourcePath = null){ public function add($resource, $resourcePath = null){
if(isset($this->resources[$resource])){
foreach((array) $resourcePath as $path){
if(!in_array($path, $this->resources[$resource], true)){
$this->resources[$resource][] = $path;
}
}
}else{
$this->resources[$resource] = (array) $resourcePath; $this->resources[$resource] = (array) $resourcePath;
} }
}
/** /**
* {@inheritdoc} * {@inheritdoc}