Merge commit '3b961d0e5'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-07-04 22:25:23 +01:00
commit 5cf74fc16b

View File

@ -31,7 +31,9 @@ use pocketmine\player\Player;
use pocketmine\utils\TextFormat; use pocketmine\utils\TextFormat;
use function count; use function count;
use function implode; use function implode;
use function sort;
use function strtolower; use function strtolower;
use const SORT_STRING;
class WhitelistCommand extends VanillaCommand{ class WhitelistCommand extends VanillaCommand{
@ -71,6 +73,7 @@ class WhitelistCommand extends VanillaCommand{
return true; return true;
case "list": case "list":
$entries = $sender->getServer()->getWhitelisted()->getAll(true); $entries = $sender->getServer()->getWhitelisted()->getAll(true);
sort($entries, SORT_STRING);
$result = implode($entries, ", "); $result = implode($entries, ", ");
$count = count($entries); $count = count($entries);