From cea1292375db64a19a00a1a933b3c1abffbec870 Mon Sep 17 00:00:00 2001 From: AriosJentu Date: Mon, 9 Sep 2019 00:27:43 +1000 Subject: [PATCH] Fix crash with increment achievement --- qcsrc/server/g_damage.qc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 3a2622783..84ab97f52 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -901,21 +901,22 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de } if (IS_DEAD(targ) && IS_PLAYER(attacker)) { + if (targ != attacker) { attacker.check_suicide = 1; attacker.suicide = 0; } else { attacker.suicide = 1; } - } - if(deathtype == DEATH_TELEFRAG.m_id) { - entity att_achv = attacker.achievements; - entity trg_achv = targ.achievements; - att_achv.inc_achievement(att_achv, "telefrag"); - trg_achv.inc_achievement(trg_achv, "surprise"); - att_achv.announce(att_achv, attacker, "telefrag"); - trg_achv.announce(trg_achv, targ, "surprise"); + if (deathtype == DEATH_TELEFRAG.m_id) { + entity att_achv = attacker.achievements; + entity trg_achv = targ.achievements; + att_achv.inc_achievement(att_achv, "telefrag"); + trg_achv.inc_achievement(trg_achv, "surprise"); + att_achv.announce(att_achv, attacker, "telefrag"); + trg_achv.announce(trg_achv, targ, "surprise"); + } } } -- 2.39.2