Merge remote-tracking branch 'origin/master' into block-id-object

This commit is contained in:
Dylan K. Taylor 2019-02-21 10:41:25 +00:00
commit e063c567be

View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\permission; namespace pocketmine\permission;
use function file_get_contents;
use function yaml_parse_file; use function yaml_parse_file;
abstract class DefaultPermissions{ abstract class DefaultPermissions{
@ -47,7 +48,7 @@ abstract class DefaultPermissions{
public static function registerCorePermissions(){ public static function registerCorePermissions(){
$manager = PermissionManager::getInstance(); $manager = PermissionManager::getInstance();
foreach(PermissionParser::loadPermissions(yaml_parse_file(\pocketmine\RESOURCE_PATH . 'default_permissions.yml')) as $permission){ foreach(PermissionParser::loadPermissions(yaml_parse(file_get_contents(\pocketmine\RESOURCE_PATH . 'default_permissions.yml'))) as $permission){
$manager->addPermission($permission); $manager->addPermission($permission);
} }
} }