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

Merge branch 'release/3.1'

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

12
src/pocketmine/permission/PermissibleBase.php
View File

@ -30,7 +30,7 @@ use pocketmine\timings\Timings;
class PermissibleBase implements Permissible{ class PermissibleBase implements Permissible{
/** @var ServerOperator */ /** @var ServerOperator */
private $opable = null; private $opable;
/** @var Permissible */ /** @var Permissible */
private $parent = null; private $parent = null;
@ -59,25 +59,15 @@ class PermissibleBase implements Permissible{
* @return bool * @return bool
*/ */
public function isOp() : bool{ public function isOp() : bool{
if($this->opable === null){
return false;
}else{
return $this->opable->isOp(); return $this->opable->isOp();
} }
}
/** /**
* @param bool $value * @param bool $value
*
* @throws \Exception
*/ */
public function setOp(bool $value){ public function setOp(bool $value){
if($this->opable === null){
throw new \LogicException("Cannot change op value as no ServerOperator is set");
}else{
$this->opable->setOp($value); $this->opable->setOp($value);
} }
}
/** /**
* @param Permission|string $name * @param Permission|string $name

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

@ -595,11 +595,7 @@ class PluginManager{
* @return bool * @return bool
*/ */
public function isPluginEnabled(Plugin $plugin) : bool{ public function isPluginEnabled(Plugin $plugin) : bool{
if($plugin instanceof Plugin and isset($this->plugins[$plugin->getDescription()->getName()])){ return isset($this->plugins[$plugin->getDescription()->getName()]) and $plugin->isEnabled();
return $plugin->isEnabled();
}else{
return false;
}
} }
/** /**
@ -668,7 +664,7 @@ class PluginManager{
}elseif(is_string($data["permission"])){ }elseif(is_string($data["permission"])){
$newCmd->setPermission($data["permission"]); $newCmd->setPermission($data["permission"]);
}else{ }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");
} }
} }