From 2676d289d9ac46a3145f3740c75e5078480ff858 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Wed, 18 Mar 2015 19:41:25 +0100
Subject: [PATCH] Reset the old HP method on PlayerSAO::setHP

---
 src/content_sao.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index e58aa4b6e..9fc61aea7 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -1072,6 +1072,10 @@ void PlayerSAO::setHP(s16 hp)
 	else if (hp > PLAYER_MAX_HP)
 		hp = PLAYER_MAX_HP;
 
+	if(hp < oldhp && g_settings->getBool("enable_damage") == false) {
+		return;
+	}
+
 	m_player->hp = hp;
 
 	if (oldhp > hp)
-- 
2.25.1