summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorpresstabstart <presstabstart@users.noreply.github.com>2017-04-07 04:32:50 +0100
committerAuke Kok <sofar+github@foo-projects.org>2017-04-06 20:32:50 -0700
commit351cc2e79a7d78f7ec97ff9b33e4f0bad4042b19 (patch)
treec0f1bedcd3ebfaf1d80ebf11fee78ecb85bdd2be /src/network
parent63e175dd70898e2ae714a025d1eaee45a453d41c (diff)
downloadminetest-351cc2e79a7d78f7ec97ff9b33e4f0bad4042b19.tar.gz
minetest-351cc2e79a7d78f7ec97ff9b33e4f0bad4042b19.tar.bz2
minetest-351cc2e79a7d78f7ec97ff9b33e4f0bad4042b19.zip
Fix multiple death messages (#5305)
Fix multiple death messages (#3565) and damage server logs after death.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/serverpackethandler.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index e0ea4bf83..95df6fc4f 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -1107,6 +1107,13 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
}
if (g_settings->getBool("enable_damage")) {
+ if (playerSAO->isDead()) {
+ verbosestream << "Server::ProcessData(): Info: "
+ "Ignoring damage as player " << player->getName()
+ << " is already dead." << std::endl;
+ return;
+ }
+
actionstream << player->getName() << " damaged by "
<< (int)damage << " hp at " << PP(playersao->getBasePosition() / BS)
<< std::endl;