From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 13 Oct 2011 23:34:40 +0000 (+0200)
Subject: Do not stop health regen when hit if hit did no damage
X-Git-Tag: xonotic-v0.6.0~40^2~30^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4713a7c83e984db209173d49abfe7d687714b939;p=xonotic%2Fxonotic-data.pk3dir.git

Do not stop health regen when hit if hit did no damage
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 92e1ce4de..f9fb0aa61 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -493,7 +493,8 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 			self.armorvalue = self.armorvalue - save;
 			self.health = self.health - take;
 			// pause regeneration for 5 seconds
-			self.pauseregen_finished = max(self.pauseregen_finished, time + autocvar_g_balance_pause_health_regen);
+			if(take)
+                self.pauseregen_finished = max(self.pauseregen_finished, time + autocvar_g_balance_pause_health_regen);
 
 			if (time > self.pain_finished)		//Don't switch pain sequences like crazy
 			{