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

Command: standardise permission checking

Browse Source 
if subcommands had different permissions, the permissionMessage would not be used.
This commit is contained in:
Dylan K. Taylor
2021-08-04 20:29:07 +01:00
parent efb677d5d5
commit 71c6f69fd3
5 changed files with 18 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/command/defaults/WhitelistCommand.php
View File

@@ -31,7 +31,6 @@ use pocketmine\lang\TranslationContainer;
use pocketmine\permission\DefaultPermissionNames;
use pocketmine\player\Player;
use pocketmine\utils\AssumptionFailedError;
use pocketmine\utils\TextFormat;
use function count;
use function implode;
use function sort;
@@ -136,12 +135,6 @@ class WhitelistCommand extends VanillaCommand{
if($permission === null){
throw new AssumptionFailedError("Unknown subcommand $subcommand");
}
if(!$sender->hasPermission($permission)){
$sender->sendMessage($sender->getLanguage()->translateString(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PERMISSION));
return true;
}
return false;
return !$this->testPermission($sender, $permission);
}
}