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

Fix /banlist and /whitelist list when no players are in the lists, close #1146

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-06-28 10:28:38 +01:00
parent ae612b913e
commit 08d4d7fe0e
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/command/defaults/BanListCommand.php
View File

@ -25,6 +25,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender; use pocketmine\command\CommandSender;
use pocketmine\event\TranslationContainer; use pocketmine\event\TranslationContainer;
use pocketmine\permission\BanEntry;
class BanListCommand extends VanillaCommand{ class BanListCommand extends VanillaCommand{
@ -58,11 +59,10 @@ class BanListCommand extends VanillaCommand{
$args[0] = "players"; $args[0] = "players";
} }
$message = "";
$list = $list->getEntries(); $list = $list->getEntries();
foreach($list as $entry){ $message = implode(", ", array_map(function(BanEntry $entry){
$message .= $entry->getName() . ", "; return $entry->getName();
} }, $list));
if($args[0] === "ips"){ if($args[0] === "ips"){
$sender->sendMessage(new TranslationContainer("commands.banlist.ips", [count($list)])); $sender->sendMessage(new TranslationContainer("commands.banlist.ips", [count($list)]));
@ -70,7 +70,7 @@ class BanListCommand extends VanillaCommand{
$sender->sendMessage(new TranslationContainer("commands.banlist.players", [count($list)])); $sender->sendMessage(new TranslationContainer("commands.banlist.players", [count($list)]));
} }
$sender->sendMessage(substr($message, 0, -2)); $sender->sendMessage($message);
return true; return true;
} }

12
src/pocketmine/command/defaults/WhitelistCommand.php
View File

@ -70,14 +70,12 @@ class WhitelistCommand extends VanillaCommand{
return true; return true;
case "list": case "list":
$result = ""; $entries = $sender->getServer()->getWhitelisted()->getAll(true);
$count = 0; $result = implode($entries, ", ");
foreach($sender->getServer()->getWhitelisted()->getAll(true) as $player){ $count = count($entries);
$result .= $player . ", ";
++$count;
}
$sender->sendMessage(new TranslationContainer("commands.whitelist.list", [$count, $count])); $sender->sendMessage(new TranslationContainer("commands.whitelist.list", [$count, $count]));
$sender->sendMessage(substr($result, 0, -2)); $sender->sendMessage($result);
return true; return true;