X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=f8acd05036ae9d7acb3982fed0502a7017598061;hp=a7296006e2201436fe376f58cfd415477152dfd1;hb=84de176ec42eeaeaa7f9b415b0f2b67adb1aa708;hpb=aa09855edb4f5a7520f536fc54ce2502e3a398e5;ds=sidebyside

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index a7296006e2..f8acd05036 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -457,7 +457,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 	damage_take = take;
 	damage_save = save;
 	damage_force = force;
-	MUTATOR_CALLHOOK(PlayerDamage);
+	MUTATOR_CALLHOOK(PlayerDamage_SplitHealthArmor);
 	take = bound(0, damage_take, self.health);
 	save = bound(0, damage_save, self.armorvalue);
 
@@ -643,7 +643,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