From bc5cc638fc510f55237d51eb031fa5f18b3f7a04 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 4 Dec 2011 03:56:22 +0200
Subject: [PATCH] Fix player not dying when beated to death by other player

---
 src/server.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/server.cpp b/src/server.cpp
index e33a675c..8fbc0f79 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -4307,13 +4307,12 @@ void Server::HandlePlayerHP(Player *player, s16 damage)
 	if(srp->m_respawn_active)
 		return;
 	
-	if(damage == 0)
-		return;
-	
 	if(player->hp > damage)
 	{
-		player->hp -= damage;
-		SendPlayerHP(player);
+		if(damage != 0){
+			player->hp -= damage;
+			SendPlayerHP(player);
+		}
 		return;
 	}
 
-- 
2.30.2