mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 12:04:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/Server.php
#	src/lang/Language.php
#	src/network/mcpe/protocol/AddItemActorPacket.php
#	src/network/mcpe/protocol/AddPlayerPacket.php
#	src/network/mcpe/protocol/SetActorDataPacket.php
#	src/network/mcpe/serializer/NetworkBinaryStream.php
#	src/permission/Permission.php
#	src/pocketmine/block/Leaves.php
#	src/pocketmine/entity/DataPropertyManager.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/item/Banner.php
#	src/pocketmine/item/Item.php
#	src/pocketmine/level/format/io/LevelProvider.php
#	src/pocketmine/level/format/io/LevelProviderManager.php
#	src/pocketmine/network/mcpe/protocol/AddActorPacket.php
#	src/pocketmine/network/mcpe/protocol/LoginPacket.php
#	src/pocketmine/tile/Banner.php
#	src/scheduler/BulkCurlTask.php
#	src/updater/AutoUpdater.php
#	src/utils/Config.php
#	src/utils/Utils.php
#	src/world/generator/Flat.php
#	src/world/generator/Generator.php
This commit is contained in:
Dylan K. Taylor
2020-01-31 21:07:34 +00:00
parent 96ac95798b 260ac47588
commit cb16f5c142
39 changed files with 164 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/permission/Permission.php
View File

@@ -45,7 +45,10 @@ class Permission{
/** @var string */
private $description;
/** @var bool[] */
/**
* @var bool[]
* @phpstan-var array<string, bool>
*/
private $children;
/** @var string */
@@ -55,6 +58,7 @@ class Permission{
* Creates a new Permission object to be attached to Permissible objects
*
* @param bool[] $children
* @phpstan-param array<string, bool> $children
*/
public function __construct(string $name, ?string $description = null, ?string $defaultValue = null, array $children = []){
$this->name = $name;
@@ -71,6 +75,7 @@ class Permission{
/**
* @return bool[]
* @phpstan-return array<string, bool>
*/
public function &getChildren() : array{
return $this->children;

2
src/permission/PermissionParser.php
View File

@@ -71,6 +71,7 @@ class PermissionParser{
/**
* @param mixed[][] $data
* @phpstan-param array<string, array<string, mixed>> $data
*
* @return Permission[]
*/
@@ -86,6 +87,7 @@ class PermissionParser{
/**
* @param mixed[] $data
* @param Permission[] $output reference parameter
* @phpstan-param array<string, mixed> $data
*
* @throws \Exception
*/