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

Merge branch 'release/3.1'

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-07-09 10:06:44 +01:00
parent 9c80e349ce 2994d0f3ae
commit 46ea0186e4
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -595,11 +595,7 @@ class PluginManager{
* @return bool
*/
public function isPluginEnabled(Plugin $plugin) : bool{
if($plugin instanceof Plugin and isset($this->plugins[$plugin->getDescription()->getName()])){
return $plugin->isEnabled();
}else{
return false;
}
return isset($this->plugins[$plugin->getDescription()->getName()]) and $plugin->isEnabled();
}
/**
@ -668,7 +664,7 @@ class PluginManager{
}elseif(is_string($data["permission"])){
$newCmd->setPermission($data["permission"]);
}else{
throw new \InvalidArgumentException("Permission must be a string or boolean, " . gettype($data["permission"] . " given"));
throw new \InvalidArgumentException("Permission must be a string or boolean, " . gettype($data["permission"]) . " given");
}
}