From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 3 Apr 2011 21:08:08 +0000 (+0300)
Subject: Some tweaks to my last commit.
X-Git-Tag: xonotic-v0.6.0~110^2^2~141
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9cb6ed6f1554d3378ee4ba84ca38aa445ab2b83f;p=xonotic%2Fxonotic-data.pk3dir.git

Some tweaks to my last commit.
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index de3f0a949..211b7d8d5 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -866,6 +866,8 @@ void PutClientInServer (void)
 
 		RemoveGrapplingHook(self); // Wazat's Grappling Hook
 
+		Violence_DamageEffect_Remove(self);
+
 		self.classname = "player";
 		self.wasplayer = TRUE;
 		self.iscreature = TRUE;
@@ -1980,7 +1982,6 @@ void respawn(void)
 	}
 
 	CopyBody(1);
-	Violence_DamageEffect_Remove(self);
 	self.effects |= EF_NODRAW; // prevent another CopyBody
 	if(self.oldcolormap)
 	{
diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index 315334a8f..cee0c28a6 100644
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -47,6 +47,7 @@ void Violence_GibSplash(entity source, float type, float amount, entity attacker
 
 void Violence_DamageEffect_Remove(entity pl)
 {
+	pl.damageeffect_repeater.nextthink = 0;
 	remove(pl.damageeffect_repeater);
 	pl.damageeffect_repeater = world;
 }
@@ -91,7 +92,6 @@ void Violence_DamageEffect_DoRepeat()
 {
 	if(time > self.lifetime || (self.owner.classname != "player" && self.owner.classname != "body"))
 	{
-		self.nextthink = 0;
 		Violence_DamageEffect_Remove(self.owner);
 		return;
 	}