mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 18:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Use an array for command permissions

Browse Source 
it doesn't make sense to have to parse the string every time we want to verify permissions, nor to expect that people will somehow know to use ; to separate them without it being documented anywhere...
This commit is contained in:
Dylan K. Taylor
2023-02-13 14:44:55 +00:00
parent cb10360c20
commit caebe14dab
13 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/command/Command.php
View File

@ -33,7 +33,7 @@ use pocketmine\permission\PermissionManager;
use pocketmine\Server;
use pocketmine\utils\BroadcastLoggerForwarder;
use pocketmine\utils\TextFormat;
use function explode;
use function implode;
use function str_replace;
abstract class Command{
@ -55,7 +55,8 @@ abstract class Command{
protected Translatable|string $usageMessage;
private ?string $permission = null;
/** @var string[] */
private array $permission = [];
private ?string $permissionMessage = null;
/**
@ -81,19 +82,28 @@ abstract class Command{
return $this->name;
}
public function getPermission() : ?string{
/**
* @return string[]
*/
public function getPermission() : array{
return $this->permission;
}
public function setPermission(?string $permission) : void{
if($permission !== null){
foreach(explode(";", $permission) as $perm){
if(PermissionManager::getInstance()->getPermission($perm) === null){
throw new \InvalidArgumentException("Cannot use non-existing permission \"$perm\"");
}
/**
* @param string[]|string|null $permissions
*/
public function setPermissions(array $permissions) : void{
$permissionManager = PermissionManager::getInstance();
foreach($permissions as $perm){
if($permissionManager->getPermission($perm) === null){
throw new \InvalidArgumentException("Cannot use non-existing permission \"$perm\"");
}
}
$this->permission = $permission;
$this->permission = $permissions;
}
public function setPermission(?string $permission) : void{
$this->setPermissions($permission === null ? [] : explode(";", $permission));
}
public function testPermission(CommandSender $target, ?string $permission = null) : bool{
@ -104,19 +114,15 @@ abstract class Command{
if($this->permissionMessage === null){
$target->sendMessage(KnownTranslationFactory::pocketmine_command_error_permission($this->name)->prefix(TextFormat::RED));
}elseif($this->permissionMessage !== ""){
$target->sendMessage(str_replace("<permission>", $permission ?? $this->permission, $this->permissionMessage));
$target->sendMessage(str_replace("<permission>", $permission ?? implode(";", $this->permission), $this->permissionMessage));
}
return false;
}
public function testPermissionSilent(CommandSender $target, ?string $permission = null) : bool{
$permission ??= $this->permission;
if($permission === null || $permission === ""){
return false;
}
foreach(explode(";", $permission) as $p){
$list = $permission !== null ? [$permission] : $this->permission;
foreach($list as $p){
if($target->hasPermission($p)){
return true;
}