From: Matthew I <matttpt@gmail.com>
Date: Sat, 28 Jul 2012 19:49:23 +0000 (-0400)
Subject: Remove trailing comma after player list in server status string
X-Git-Tag: 0.4.3~32
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8e0ac70c4ddfffedcd9e85b409360b4356d033c4;p=oweals%2Fminetest.git

Remove trailing comma after player list in server status string
---

diff --git a/src/server.cpp b/src/server.cpp
index 05dff06c5..85e361ced 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4449,9 +4449,10 @@ std::wstring Server::getStatusString()
 	// Uptime
 	os<<L", uptime="<<m_uptime.get();
 	// Information about clients
+	core::map<u16, RemoteClient*>::Iterator i;
+	bool first;
 	os<<L", clients={";
-	for(core::map<u16, RemoteClient*>::Iterator
-		i = m_clients.getIterator();
+	for(i = m_clients.getIterator(), first = true;
 		i.atEnd() == false; i++)
 	{
 		// Get client and check that it is valid
@@ -4466,7 +4467,11 @@ std::wstring Server::getStatusString()
 		if(player != NULL)
 			name = narrow_to_wide(player->getName());
 		// Add name to information string
-		os<<name<<L",";
+		if(!first)
+			os<<L",";
+		else
+			first = false;
+		os<<name;
 	}
 	os<<L"}";
 	if(((ServerMap*)(&m_env->getMap()))->isSavingEnabled() == false)