Check for duplicate login in TOSERVER_INIT handler (#11017)

i.e. checks for duplicate logins before sending all media data to the client.

diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index b863e182823309545d7a33d0a3ab9f9bde906878..5b378a0832b5c17849e1ec1ab7ef26e21ab6e6f7 100644 (file)
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -174,6 +174,16 @@ void Server::handleCommand_Init(NetworkPacket* pkt)
                return;
        }
 
+       RemotePlayer *player = m_env->getPlayer(playername);
+
+       // If player is already connected, cancel
+       if (player && player->getPeerId() != PEER_ID_INEXISTENT) {
+               actionstream << "Server: Player with name \"" << playername <<
+                       "\" tried to connect, but player with same name is already connected" << std::endl;
+               DenyAccess(peer_id, SERVER_ACCESSDENIED_ALREADY_CONNECTED);
+               return;
+       }
+
        m_clients.setPlayerName(peer_id, playername);
        //TODO (later) case insensitivity