Merge remote branch 'origin/master' into samual/keepaway

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_player.qc

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index cb20a91a4f3eee6246a6b666ea7db291cae22556..b76e9a693471711b078c2690aaad753671ef1782 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -455,7 +455,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);
 
@@ -626,7 +626,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