Some tweaks to my last commit.

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index de3f0a9490d32b95a873aae535ed956eb12ce341..211b7d8d56875d1e8c7515472fc76c45157cdb6e 100644 (file)
--- 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 315334a8fccf2c5aa68f50e460560edfe61fe351..cee0c28a68bf07aa97c9fc3db73b9c584fd77ed3 100644 (file)
--- 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;
        }