Fix mines with no target checking pickmeup

This commit is contained in:
Antonio Martinez 2025-06-06 00:02:17 -04:00
parent 84fff960f2
commit cd68af7e92

View file

@ -273,14 +273,16 @@ static inline BlockItReturn_t PIT_SSMineSearch(mobj_t *thing)
if (!cv_debugpickmeup.value)
{
if (thing == grenade->target) // Don't blow up at your owner instantly.
return BMIT_CONTINUE;
if (grenade->target && !P_MobjWasRemoved(grenade->target))
{
if (thing == grenade->target) // Don't blow up at your owner instantly.
return BMIT_CONTINUE;
if (grenade->target->player && thing->player && G_SameTeam(grenade->target->player, thing->player))
return BMIT_CONTINUE;
if (grenade->target->player && thing->player && G_SameTeam(grenade->target->player, thing->player))
return BMIT_CONTINUE;
}
}
if (PIT_SSMineChecks(thing) == true)
return BMIT_CONTINUE;