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

Merge branch 'release/3.2' into release/3.3

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-11-11 11:15:39 +00:00
commit b893645a81
1 changed files with 124 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,8 +199,10 @@ class PluginManager{
* @return Plugin[] * @return Plugin[]
*/ */
public function loadPlugins(string $directory, array $newLoaders = null){ public function loadPlugins(string $directory, array $newLoaders = null){
if(!is_dir($directory)){
return [];
}
if(is_dir($directory)){
$plugins = []; $plugins = [];
$loadedPlugins = []; $loadedPlugins = [];
$dependencies = []; $dependencies = [];
@ -226,7 +228,10 @@ class PluginManager{
} }
try{ try{
$description = $loader->getPluginDescription($file); $description = $loader->getPluginDescription($file);
if($description instanceof PluginDescription){ if($description === null){
continue;
}
$name = $description->getName(); $name = $description->getName();
if(stripos($name, "pocketmine") !== false or stripos($name, "minecraft") !== false or stripos($name, "mojang") !== false){ if(stripos($name, "pocketmine") !== false or stripos($name, "minecraft") !== false or stripos($name, "mojang") !== false){
$this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [$name, "%pocketmine.plugin.restrictedName"])); $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.loadError", [$name, "%pocketmine.plugin.restrictedName"]));
@ -271,7 +276,6 @@ class PluginManager{
$softDependencies[$before] = [$name]; $softDependencies[$before] = [$name];
} }
} }
}
}catch(\Throwable $e){ }catch(\Throwable $e){
$this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.fileError", [$file, $directory, $e->getMessage()])); $this->server->getLogger()->error($this->server->getLanguage()->translateString("pocketmine.plugin.fileError", [$file, $directory, $e->getMessage()]));
$this->server->getLogger()->logException($e); $this->server->getLogger()->logException($e);
@ -350,9 +354,6 @@ class PluginManager{
} }
return $loadedPlugins; return $loadedPlugins;
}else{
return [];
}
} }
/** /**