From b2f6a65bc9d8b9af394c15db277db4cb6d2e8a55 Mon Sep 17 00:00:00 2001
From: Zemtzov7 <72821250+zmv7@users.noreply.github.com>
Date: Wed, 21 Aug 2024 23:25:41 +0500
Subject: [PATCH] Sort clients in `minetest.get_server_status` and privs in
 `minetest.privs_to_string` (#15023)

---
 builtin/common/misc_helpers.lua | 1 +
 builtin/game/chat.lua           | 1 +
 src/server.cpp                  | 9 +++------
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index fb38c1b35..21752ce7f 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -702,6 +702,7 @@ function core.privs_to_string(privs, delim)
 			list[#list + 1] = priv
 		end
 	end
+	table.sort(list)
 	return table.concat(list, delim)
 end
 
diff --git a/builtin/game/chat.lua b/builtin/game/chat.lua
index baab5212f..b7e2aea50 100644
--- a/builtin/game/chat.lua
+++ b/builtin/game/chat.lua
@@ -221,6 +221,7 @@ core.register_chatcommand("haspriv", {
 			return true, S("No online player has the \"@1\" privilege.",
 					param)
 		else
+			table.sort(players_with_priv)
 			return true, S("Players online with the \"@1\" privilege: @2",
 					param,
 					table.concat(players_with_priv, ", "))
diff --git a/src/server.cpp b/src/server.cpp
index 0b0786209..1d98e4634 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -3181,14 +3181,11 @@ std::string Server::getStatusString()
 	bool first = true;
 	os << " | clients: ";
 	if (m_env) {
-		std::vector<session_t> clients = m_clients.getClientIDs();
-		for (session_t client_id : clients) {
-			RemotePlayer *player = m_env->getPlayer(client_id);
+		std::vector<std::string> player_names = m_clients.getPlayerNames();
 
-			// Get name of player
-			const std::string name = player ? player->getName() : "<unknown>";
+		std::sort(player_names.begin(), player_names.end());
 
-			// Add name to information string
+		for (const std::string& name : player_names) {
 			if (!first)
 				os << ", ";
 			else