projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f8bdda
)
Use actionstream instead of errorstream when failing to emerge player
author
Craig Davison
<craig.davison3@gmail.com>
Tue, 23 Jun 2015 14:46:35 +0000
(15:46 +0100)
committer
est31
<MTest31@outlook.com>
Tue, 23 Jun 2015 17:25:06 +0000
(19:25 +0200)
src/network/serverpackethandler.cpp
patch
|
blob
|
history
diff --git
a/src/network/serverpackethandler.cpp
b/src/network/serverpackethandler.cpp
index 4633aba8627e9c02448dcef316c33da5672b1ada..0a6ef4fa85f0837a0cdc6f086d36a10c56f82877 100644
(file)
--- a/
src/network/serverpackethandler.cpp
+++ b/
src/network/serverpackethandler.cpp
@@
-576,7
+576,7
@@
void Server::handleCommand_Init_Legacy(NetworkPacket* pkt)
static_cast<RemotePlayer*>(m_env->getPlayer(playername));
if (player && player->peer_id != 0) {
-
error
stream << "Server: " << playername << ": Failed to emerge player"
+
action
stream << "Server: " << playername << ": Failed to emerge player"
<< " (player allocated to an another client)" << std::endl;
DenyAccess_Legacy(pkt->getPeerId(), L"Another client is connected with this "
L"name. If your client closed unexpectedly, try again in "