MTSR/minetest
3
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2024-09-19 23:10:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sort clients in minetest.get_server_status and privs in minetest.privs_to_string (#15023)

Browse Source
This commit is contained in:
Zemtzov7 2024-08-21 23:25:41 +05:00 committed by GitHub
parent 6cc0452503
commit b2f6a65bc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/common/misc_helpers.lua
View File

@ -702,6 +702,7 @@ function core.privs_to_string(privs, delim)
list[#list + 1] = priv list[#list + 1] = priv
end end
end end
table.sort(list)
return table.concat(list, delim) return table.concat(list, delim)
end end

1
builtin/game/chat.lua
View File

@ -221,6 +221,7 @@ core.register_chatcommand("haspriv", {
return true, S("No online player has the \"@1\" privilege.", return true, S("No online player has the \"@1\" privilege.",
param) param)
else else
table.sort(players_with_priv)
return true, S("Players online with the \"@1\" privilege: @2", return true, S("Players online with the \"@1\" privilege: @2",
param, param,
table.concat(players_with_priv, ", ")) table.concat(players_with_priv, ", "))

9
src/server.cpp
View File

@ -3181,14 +3181,11 @@ std::string Server::getStatusString()
bool first = true; bool first = true;
os << " | clients: "; os << " | clients: ";
if (m_env) { if (m_env) {
std::vector<session_t> clients = m_clients.getClientIDs(); std::vector<std::string> player_names = m_clients.getPlayerNames();
for (session_t client_id : clients) {
RemotePlayer *player = m_env->getPlayer(client_id);
// Get name of player std::sort(player_names.begin(), player_names.end());
const std::string name = player ? player->getName() : "<unknown>";
// Add name to information string for (const std::string& name : player_names) {
if (!first) if (!first)
os << ", "; os << ", ";
else else