mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-10-18 12:04:46 +00:00
Merge branch 'stable'
This commit is contained in:
@@ -38,7 +38,7 @@ class BanEntry{
|
||||
/** @var string */
|
||||
private $name;
|
||||
/** @var \DateTime */
|
||||
private $creationDate = null;
|
||||
private $creationDate;
|
||||
/** @var string */
|
||||
private $source = "(Unknown)";
|
||||
/** @var \DateTime|null */
|
||||
|
@@ -32,7 +32,7 @@ class PermissibleBase implements Permissible{
|
||||
/** @var ServerOperator */
|
||||
private $opable;
|
||||
|
||||
/** @var Permissible */
|
||||
/** @var Permissible|null */
|
||||
private $parent = null;
|
||||
|
||||
/** @var PermissionAttachment[] */
|
||||
|
@@ -28,7 +28,7 @@ use pocketmine\plugin\Plugin;
|
||||
trait PermissibleDelegateTrait{
|
||||
|
||||
/** @var PermissibleBase */
|
||||
private $perm = null;
|
||||
private $perm;
|
||||
|
||||
/**
|
||||
* @param Permission|string $name
|
||||
|
@@ -27,7 +27,7 @@ use pocketmine\plugin\Plugin;
|
||||
use pocketmine\plugin\PluginException;
|
||||
|
||||
class PermissionAttachment{
|
||||
/** @var PermissionRemovedExecutor */
|
||||
/** @var PermissionRemovedExecutor|null */
|
||||
private $removed = null;
|
||||
|
||||
/** @var bool[] */
|
||||
@@ -84,7 +84,7 @@ class PermissionAttachment{
|
||||
*/
|
||||
public function setPermissions(array $permissions) : void{
|
||||
foreach($permissions as $key => $value){
|
||||
$this->permissions[$key] = (bool) $value;
|
||||
$this->permissions[$key] = $value;
|
||||
}
|
||||
$this->permissible->recalculatePermissions();
|
||||
}
|
||||
|
@@ -102,9 +102,7 @@ class PermissionParser{
|
||||
if(is_array($data["children"])){
|
||||
foreach($data["children"] as $k => $v){
|
||||
if(is_array($v)){
|
||||
if(($perm = self::loadPermission($k, $v, $default, $output)) !== null){
|
||||
$output[] = $perm;
|
||||
}
|
||||
$output[] = self::loadPermission($k, $v, $default, $output);
|
||||
}
|
||||
$children[$k] = true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user