From 0b97ad838466ed44296a2c663b2dc034feb51f67 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 12 Nov 2011 15:41:29 +0200
Subject: ServerRemotePlayer implements ServerActiveObject

---
 src/server.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index fd9703bd5..330ce21c2 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4279,11 +4279,7 @@ Player *Server::emergePlayer(const char *name, const char *password, u16 peer_id
 		Create a new player
 	*/
 	{
-		player = new ServerRemotePlayer();
-		//player->peer_id = c.peer_id;
-		//player->peer_id = PEER_ID_INEXISTENT;
-		player->peer_id = peer_id;
-		player->updateName(name);
+		// Add authentication stuff
 		m_authmanager.add(name);
 		m_authmanager.setPassword(name, password);
 		m_authmanager.setPrivs(name,
@@ -4294,11 +4290,11 @@ Player *Server::emergePlayer(const char *name, const char *password, u16 peer_id
 		*/
 		
 		infostream<<"Server: Finding spawn place for player \""
-				<<player->getName()<<"\""<<std::endl;
+				<<name<<"\""<<std::endl;
 
 		v3f pos = findSpawnPos(m_env->getServerMap());
 
-		player->setPosition(pos);
+		player = new ServerRemotePlayer(m_env, pos, peer_id, name);
 
 		/*
 			Add player to environment
-- 
cgit v1.2.3