From: Loic Blot <loic.blot@unix-experience.fr>
Date: Mon, 16 Mar 2015 09:01:56 +0000 (+0100)
Subject: If player is dead, permit it to respawn, even if damages are not enabled
X-Git-Tag: 0.4.13~482
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aaf26b3a4410c4a1dc2f4a8bb9c61122648fedf3;p=oweals%2Fminetest.git

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
---

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());