X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=765c7802d2a10707f29bff7b672ae99673e635ae;hp=d890f5d591ad49bc4ef21d0a9a2456704f5a5752;hb=7eb1015823c7b86bd36ad10be79701239e695dec;hpb=57574d20e9aa4cf305e28e2cd4b7749dabe4f8ea

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index d890f5d59..765c7802d 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -449,6 +449,16 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		take = damage;
 	}
 
+	frag_inflictor = inflictor;
+	frag_attacker = attacker;
+	frag_target = self;
+	damage_take = take;
+	damage_save = save;
+	damage_force = force;
+	MUTATOR_CALLHOOK(PlayerDamage_SplitHealthArmor);
+	take = bound(0, damage_take, self.health);
+	save = bound(0, damage_save, self.armorvalue);
+
 	if(sound_allowed(MSG_BROADCAST, attacker))
 	{
 		if (save > 10)
@@ -610,7 +620,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 			else
 				DropFlag(self.flagcarried, world, attacker);
 		}
-		if(self.ballcarried)
+		if(self.ballcarried && g_nexball)
 			DropBall(self.ballcarried, self.origin, self.velocity);
 		Portal_ClearAllLater(self);
 		// clear waypoints
@@ -665,11 +675,6 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		// set up to fade out later
 		SUB_SetFade (self, time + 6 + random (), 1);
 
-		// remove laserdot
-		if(self.weaponentity)
-			if(self.weaponentity.lasertarget)
-				remove(self.weaponentity.lasertarget);
-
 		if(clienttype(self) == CLIENTTYPE_REAL)
 		{
 			self.fixangle = TRUE;