Merge branch 'master' into Mario/vaporizer_damage

[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 d899b3db3a8f85587c1c9ab152f043b2db29f93e..f5d1a10ba410de3d8db92ae50454483d51a13a69 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -547,8 +547,10 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
                frag_attacker = attacker;
                frag_inflictor = inflictor;
                frag_target = self;
+               frag_damage = excess;
                frag_deathtype = deathtype;
                MUTATOR_CALLHOOK(PlayerDies);
+               excess = frag_damage;
 
                WEP_ACTION(self.weapon, WR_PLAYERDEATH);