diff --git a/src/p_user.c b/src/p_user.c index c5f919c78ec4f6ee73f8535f730ef7883e549cc3..f3ebc7dff9472f04179cc70af3af24d3b63e8fe2 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -969,6 +969,9 @@ pflags_t P_GetJumpFlags(player_t *player) // boolean P_PlayerInPain(player_t *player) { + // If the player doesn't have a mobj, it can't be in pain. + if !(player->mo) + return false; // no silly, sliding isn't pain if (!(player->pflags & PF_SLIDING) && player->mo->state == &states[player->mo->info->painstate] && player->powers[pw_flashing]) return true;