From c1e0d3e031d8fec376f30a3af771201eb9ced6cf Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 25 Dec 2010 03:33:38 +0200
Subject: some tinkering around

---
 src/server.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index 3bdabdfa6..e210d4d64 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2313,6 +2313,11 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 
 		dstream<<"CHAT: "<<wide_to_narrow(message)<<std::endl;
 
+		// Get player name of this client
+		std::wstring name = narrow_to_wide(player->getName());
+
+		std::wstring line = std::wstring(L"<")+name+L"> "+message;
+		
 		/*
 			Send the message to all other clients
 		*/
@@ -2330,14 +2335,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 			if(peer_id == client->peer_id)
 				continue;
 
-			// Get player name of this client
-			std::wstring name = L"unknown";
-			Player *player = m_env.getPlayer(client->peer_id);
-			if(player != NULL)
-				name = narrow_to_wide(player->getName());
-			
-			SendChatMessage(client->peer_id,
-					std::wstring(L"<")+name+L"> "+message);
+			SendChatMessage(client->peer_id, line);
 		}
 	}
 	else
-- 
cgit v1.2.3