From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 11 Jan 2015 15:04:47 +0000 (-0800)
Subject: Kill god mode support for clones/corpses.
X-Git-Tag: xonotic-v0.8.0~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d7d9a6387468726d050ff10171460a53ee94f9b;p=xonotic%2Fxonotic-data.pk3dir.git

Kill god mode support for clones/corpses.
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 68239035f..ce6cda2c7 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -174,13 +174,11 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float
 	if (take > 100)
 		Violence_GibSplash_At(hitloc, force * -0.2, 3, 1, self, attacker);
 
-	if (!(self.flags & FL_GODMODE))
-	{
-		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);
-	}
+	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);
+
 	self.dmg_save = self.dmg_save + save;//max(save - 10, 0);
 	self.dmg_take = self.dmg_take + take;//max(take - 10, 0);
 	self.dmg_inflictor = inflictor;