X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fcl_player.qc;h=db8bc4bfc94ec7b8bda49b0a2146bc58576348eb;hb=c8a8df111823d8a9a5a8ea71296c11745d00fd1a;hp=2fe7d512089e9e655b9d5a51491d03bb5ff53a73;hpb=3e5c79abf7c0dcb65c1fbb10894b1a18a57091c0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 2fe7d5120..db8bc4bfc 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -111,6 +111,7 @@ void CopyBody(float keepvelocity)
 	self.enemy = oldself;
 	self.lip = oldself.lip;
 	self.colormap = oldself.colormap;
+	self.glowmod = oldself.glowmod;
 	self.iscreature = oldself.iscreature;
 	self.angles = oldself.angles;
 	self.avelocity = oldself.avelocity;
@@ -659,7 +660,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		// call the corpse damage function just in case it wants to gib
 		self.event_damage(inflictor, attacker, 0, deathtype, hitloc, force);
 		// set up to fade out later
-		SUB_SetFade (self, time + 12 + random () * 4, 1);
+		SUB_SetFade (self, time + 6 + random (), 1);
 
 		// remove laserdot
 		if(self.weaponentity)