X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=aed2e2b575d7f14924e0e2ecba1b4d960cda4785;hp=bd1149b6277093599beb92ae15b519c0d9f8f637;hb=d6d052a48359a46ac57774650797e6cc6a6d7f31;hpb=e2daf8d138855a357293af335c1406ac2f808870

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index bd1149b627..aed2e2b575 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -881,6 +881,8 @@ void PutClientInServer (void)
 
 		RemoveGrapplingHook(self); // Wazat's Grappling Hook
 
+		Violence_DamageEffect_Remove(self);
+
 		self.classname = "player";
 		self.wasplayer = TRUE;
 		self.iscreature = TRUE;
@@ -1992,6 +1994,7 @@ void respawn(void)
 		pointparticles(particleeffectnum("respawn_ghost"), self.origin, '0 0 0', 1);
 		if(autocvar_g_respawn_ghosts_maxtime)
 			SUB_SetFade (self, time + autocvar_g_respawn_ghosts_maxtime / 2 + random () * (autocvar_g_respawn_ghosts_maxtime - autocvar_g_respawn_ghosts_maxtime / 2), 1.5);
+		Violence_DamageEffect_Remove(self);
 	}
 
 	CopyBody(1);