diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index b98c1d3cf5..66bdbe2a2c 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -1556,6 +1556,10 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage, AActor *target; AActor *inflictor; + if (player == NULL) + { + return; + } target = player->mo; inflictor = source; if (target->health <= 0) @@ -1567,11 +1571,8 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage, { // target is invulnerable return; } - if (player) - { - // Take half damage in trainer mode - damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor)); - } + // Take half damage in trainer mode + damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor)); // Handle passive damage modifiers (e.g. PowerProtection) if (target->Inventory != NULL) {