Merge branch 'invalid-rideroid-pickup' into 'master'

Fix Rideroids grabbing you out of lightsnake

Closes #1398

See merge request KartKrew/Kart!2392
This commit is contained in:
Oni 2024-05-20 21:20:41 +00:00
commit 8c0cecf289

View file

@ -540,7 +540,7 @@ void Obj_RideroidNodeThink(mobj_t *mo)
// check for players coming near us.
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i] || players[i].spectator || players[i].rideroid ||
if (!playeringame[i] || players[i].spectator || players[i].rideroid || players[i].respawn.state != RESPAWNST_NONE ||
players[i].rdnodepull || K_isPlayerInSpecialState(&players[i]) || P_PlayerInPain(&players[i]))
continue;