Handle invulnerability before buddha mode when kill player entered

releasenotes.md

@@ -6,6 +6,7 @@
 * Minor changes have been made to text that is output to the console.
 * The `if` CCMD now works with boolean CVARs.
 * Blood splats are now rendered in the top half of the player’s view if not completely obscured by the map’s geometry.
+* If the player enters `kill player` in the console while buddha mode is enabled, their health is now reduced to 1%.
 * `SIGIL.WAD` is no longer autoloaded if a PWAD is loaded that contains an `E1M1` lump.
 * If `SIGIL.WAD` or `NERVE.WAD` are in the autoload folder, they are now loaded before any other PWADs.
 * Minor improvements have been made to the highlight effect in the menu.

src/c_cmds.c

@@ -3329,17 +3329,6 @@ static void kill_cmd_func2(char *cmd, char *parms)
                 return;
             }
 
-            if (viewplayer->cheats & CF_BUDDHA)
-            {
-                if (M_StringCompare(playername, playername_default))
-                    C_Warning(0, "You can't kill yourself in buddha mode!");
-                else
-                    C_Warning(0, "%s can't kill %s in buddha mode!", playername, preferredpronoun(reflexive));
-
-                player_cvars_func2(stringize(health), "1");
-                return;
-            }
-
             if (viewplayer->powers[pw_invulnerability])
             {
                 if (M_StringCompare(playername, playername_default))
@@ -3358,6 +3347,17 @@ static void kill_cmd_func2(char *cmd, char *parms)
                 return;
             }
 
+            if (viewplayer->cheats & CF_BUDDHA)
+            {
+                if (M_StringCompare(playername, playername_default))
+                    C_Warning(0, "You can't kill yourself in buddha mode!");
+                else
+                    C_Warning(0, "%s can't kill %s in buddha mode!", playername, preferredpronoun(reflexive));
+
+                player_cvars_func2(stringize(health), "1");
+                return;
+            }
+
             massacre = true;
 
             viewplayer->damagecount = MIN(viewplayer->health, 100);