Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/CortexPE/Commando/BaseCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ final public function execute(CommandSender $sender, string $commandLabel, array
)
);
} elseif(empty($msg)) {
$sender->sendMessage(str_replace("<permission>", $cmd->getPermission(), $msg));
$sender->sendMessage(str_replace("<permission>", implode(";", $cmd->getPermission()), $msg));
}

return;
Expand Down
31 changes: 21 additions & 10 deletions src/CortexPE/Commando/BaseSubCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
use CortexPE\Commando\traits\ArgumentableTrait;
use CortexPE\Commando\traits\IArgumentable;
use pocketmine\command\CommandSender;
use pocketmine\permission\PermissionManager;
use pocketmine\plugin\Plugin;
use function explode;

Expand All @@ -47,8 +48,8 @@ abstract class BaseSubCommand implements IArgumentable, IRunnable {
private string $description;
/** @var string */
protected string $usageMessage;
/** @var string|null */
private ?string $permission = null;
/** @var string[] */
private array $permissions = [];
/** @var CommandSender */
protected CommandSender $currentSender;
/** @var BaseCommand */
Expand Down Expand Up @@ -97,24 +98,34 @@ public function getUsageMessage(): string {
}

/**
* @return string|null
* @return string[]
*/
public function getPermission(): ?string {
return $this->permission;
public function getPermissions(): array {
return $this->permissions;
}

/**
* @param string $permission
* @param string[] $permissions
*/
public function setPermission(string $permission): void {
$this->permission = $permission;
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->permissions = $permissions;
}

public function setPermission(?string $permission): void{
$this->setPermissions($permission === null ? [] : explode(";", $permission, limit: PHP_INT_MAX));
}

public function testPermissionSilent(CommandSender $sender): bool {
if(empty($this->permission)) {
if(count($this->permissions) === 0) {
return true;
}
foreach(explode(";", $this->permission) as $permission) {
foreach($this->permissions as $permission) {
if($sender->hasPermission($permission)) {
return true;
}
Expand Down
5 changes: 4 additions & 1 deletion src/CortexPE/Commando/IRunnable.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ public function getAliases(): array;

public function getUsageMessage():string;

public function getPermission(); // f*ck. PM didn't declare a return type... reeee
/**
* @return string[]
*/
public function getPermissions(): array;

/**
* @return BaseConstraint[]
Expand Down