From: terencehill Date: Sat, 6 Jan 2024 21:43:01 +0000 (+0100) Subject: Freezetag: fix "Player was frozen by " shown when a player kill themself by falling... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=690cf7356e591fcbbf2d7c938f35a5fa70fd68ef;p=xonotic%2Fxonotic-data.pk3dir.git Freezetag: fix "Player was frozen by " shown when a player kill themself by falling into the void --- diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index 871e2fc57..7676d8aea 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -494,18 +494,15 @@ MUTATOR_HOOKFUNCTION(ft, PlayerDies) } freezetag_LastPlayerForTeam_Notify(frag_target); - if (frag_target.lives > 0) + if (frag_target.lives >= 0) { - if(frag_attacker == frag_target || frag_attacker == NULL) + if(frag_attacker == frag_target || !IS_PLAYER(frag_attacker)) { - if(IS_PLAYER(frag_target)) - Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_SELF); + Send_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CENTER_FREEZETAG_SELF); Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_SELF, frag_target.netname); } else - { Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_FREEZETAG_FREEZE, frag_target.netname, frag_attacker.netname); - } } return true;