Skip to content
Snippets Groups Projects
Commit 8c0cecf2 authored by Oni's avatar Oni
Browse files

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

Fix Rideroids grabbing you out of lightsnake

Closes #1398

See merge request KartKrew/Kart!2392
parents 4b437e9a 3610fb88
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment