]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Do not stop health regen when hit if hit did no damage
authorJakob MG <jakob_mg@hotmail.com>
Thu, 13 Oct 2011 23:34:40 +0000 (01:34 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 13 Oct 2011 23:34:40 +0000 (01:34 +0200)
qcsrc/server/cl_player.qc

index 92e1ce4dea150f5a22cca701b11f05252035cba3..f9fb0aa61ebd0459f1621ec91074021447dc5468 100644 (file)
@@ -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
                        {