]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Freezetag: fix "Player was frozen by " shown when a player kill themself by falling...
authorterencehill <piuntn@gmail.com>
Sat, 6 Jan 2024 21:43:01 +0000 (22:43 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 6 Jan 2024 21:43:01 +0000 (22:43 +0100)
qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc

index 871e2fc57dd3c559c3654a02769e8df2620b9b0b..7676d8aea1d5d70328a520ed298fe2665fed7e30 100644 (file)
@@ -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;