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

Merge branch 'release/3.0' into release/3.1

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

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

@ -30,7 +30,7 @@ use pocketmine\timings\Timings;
class PermissibleBase implements Permissible{
/** @var ServerOperator */
private $opable = null;
private $opable;
/** @var Permissible */
private $parent = null;
@ -59,24 +59,14 @@ class PermissibleBase implements Permissible{
* @return bool
*/
public function isOp() : bool{
if($this->opable === null){
return false;
}else{
return $this->opable->isOp();
}
return $this->opable->isOp();
}
/**
* @param bool $value
*
* @throws \Exception
*/
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);
}
/**

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

@ -596,11 +596,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();
}
/**
@ -669,7 +665,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");
}
}