Merge branch 'acs-sector-no-spectator' into 'master'

ACS: Prevent spectators from using sector actions

See merge request KartKrew/Kart!1219
This commit is contained in:
Sal 2023-05-03 14:49:40 +00:00
commit 41770be966

View file

@ -5920,11 +5920,28 @@ void P_CheckMobjTouchingSectorActions(mobj_t *mobj, boolean continuous)
{
sector_t *originalsector;
if (!mobj->subsector)
if (mobj->subsector == NULL)
{
return;
}
originalsector = mobj->subsector->sector;
if (mobj->player != NULL)
{
if (mobj->player->spectator == true)
{
// Ignore spectators.
return;
}
if (mobj->player->pflags & PF_NOCONTEST)
{
// Ignore NO CONTEST.
return;
}
}
P_CheckMobj3DFloorAction(mobj, originalsector, continuous);
if TELEPORTED(mobj) return;