diff options
| author | est31 <MTest31@outlook.com> | 2015-05-19 00:55:58 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-05-19 00:55:58 +0200 |
| commit | 497299afd62e2f9b18dbf2a366bb22996e73102b (patch) | |
| tree | cce092e215868bd7da54d918623818e53f80e25a /src | |
| parent | d2ca662569427d36642660314668e416bf68f3c8 (diff) | |
| download | minetest-497299afd62e2f9b18dbf2a366bb22996e73102b.tar.gz minetest-497299afd62e2f9b18dbf2a366bb22996e73102b.tar.bz2 minetest-497299afd62e2f9b18dbf2a366bb22996e73102b.zip | |
Lower log level for unexpected behaviour
Its a possible mistake to log in to a server with twice the same name.
Before, it triggered a server wide error message, now it logs to actionstream.
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/serverpackethandler.cpp | 4 | ||||
| -rw-r--r-- | src/server.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp index 1eb7064d6..ea1528c64 100644 --- a/src/network/serverpackethandler.cpp +++ b/src/network/serverpackethandler.cpp @@ -613,7 +613,7 @@ void Server::handleCommand_Init2(NetworkPacket* pkt) playersao = StageTwoClientInit(pkt->getPeerId()); if (playersao == NULL) { - errorstream + actionstream << "TOSERVER_INIT2 stage 2 client init failed for peer " << pkt->getPeerId() << std::endl; return; @@ -710,7 +710,7 @@ void Server::handleCommand_ClientReady(NetworkPacket* pkt) PlayerSAO* playersao = StageTwoClientInit(peer_id); if (playersao == NULL) { - errorstream + actionstream << "TOSERVER_CLIENT_READY stage 2 client init failed for peer_id: " << peer_id << std::endl; m_con.DisconnectPeer(peer_id); diff --git a/src/server.cpp b/src/server.cpp index 778a93241..22b7d38f2 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1073,16 +1073,16 @@ PlayerSAO* Server::StageTwoClientInit(u16 peer_id) static_cast<RemotePlayer*>(m_env->getPlayer(playername.c_str())); // If failed, cancel - if((playersao == NULL) || (player == NULL)) { - if(player && player->peer_id != 0) { - errorstream<<"Server: "<<playername<<": Failed to emerge player" - <<" (player allocated to an another client)"<<std::endl; + if ((playersao == NULL) || (player == NULL)) { + if (player && player->peer_id != 0) { + actionstream << "Server: Failed to emerge player \"" << playername + << "\" (player allocated to an another client)" << std::endl; DenyAccess_Legacy(peer_id, L"Another client is connected with this " L"name. If your client closed unexpectedly, try again in " L"a minute."); } else { - errorstream<<"Server: "<<playername<<": Failed to emerge player" - <<std::endl; + errorstream << "Server: " << playername << ": Failed to emerge player" + << std::endl; DenyAccess_Legacy(peer_id, L"Could not allocate player."); } return NULL; |