Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index cae5e3520bc5043939e32f5abeb20952b0eb40b4..34d384c2833ad502a2c164992e2d68ac57481e35 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -29,7 +29,7 @@ void Violence_GibSplash_At(vector org, vector dir, float type, float amount, ent
        // if this is a copied dead body, send the num of its player instead
        // TODO: remove this field, read from model txt files
        if(self.classname == "body")
-               e.team = num_for_edict(self.owner);
+               e.team = num_for_edict(self.enemy);
        else
                e.team = num_for_edict(self);