summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2015-03-16 10:01:56 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2015-03-16 10:02:01 +0100
commitaaf26b3a4410c4a1dc2f4a8bb9c61122648fedf3 (patch)
tree76e71b9ac980cf9b52d4b84bebc0fd28e71e3d5d /src/network
parentb2801d8127f4b25fd96f981974763f33bc7ff42b (diff)
downloadminetest-aaf26b3a4410c4a1dc2f4a8bb9c61122648fedf3.tar.gz
minetest-aaf26b3a4410c4a1dc2f4a8bb9c61122648fedf3.tar.bz2
minetest-aaf26b3a4410c4a1dc2f4a8bb9c61122648fedf3.zip
If player is dead, permit it to respawn, even if damages are not enabled
* Mods can do setHP function to do damages and override the enable_damage value sometimes
Diffstat (limited to 'src/network')
-rw-r--r--src/network/packethandlers/server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/packethandlers/server.cpp b/src/network/packethandlers/server.cpp
index 9070be356..bb3a53463 100644
--- a/src/network/packethandlers/server.cpp
+++ b/src/network/packethandlers/server.cpp
@@ -1335,7 +1335,7 @@ void Server::handleCommand_Respawn(NetworkPacket* pkt)
return;
}
- if (!player->isDead() || !g_settings->getBool("enable_damage"))
+ if (!player->isDead())
return;
RespawnPlayer(pkt->getPeerId());