diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-11-12 15:41:29 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:40 +0200 |
commit | 0b97ad838466ed44296a2c663b2dc034feb51f67 (patch) | |
tree | 85244222b72015bf9e68dd8f58f6e00a744d3e0b /src/server.cpp | |
parent | ddaff2d653efb1bebe04b9d316fe1bde26671b82 (diff) | |
download | minetest-0b97ad838466ed44296a2c663b2dc034feb51f67.tar.gz minetest-0b97ad838466ed44296a2c663b2dc034feb51f67.tar.bz2 minetest-0b97ad838466ed44296a2c663b2dc034feb51f67.zip |
ServerRemotePlayer implements ServerActiveObject
Diffstat (limited to 'src/server.cpp')
-rw-r--r-- | src/server.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
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 |