Merge branch 'Rocket-sneaker-cleanup' into 'next'

Properly detach rocket sneakers when the player dies

See merge request KartKrew/Kart-Public!271
This commit is contained in:
Sal 2022-03-29 22:18:30 +00:00
commit 7b113b5f39

View file

@ -2183,7 +2183,9 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
P_SetTarget(&target->target->hnext, NULL); P_SetTarget(&target->target->hnext, NULL);
} }
} }
// // Above block does not clean up rocket sneakers when a player dies, so we need to do it here target->target is null when using rocket sneakers
if (target->player)
K_DropRocketSneaker(target->player);
// Let EVERYONE know what happened to a player! 01-29-2002 Tails // Let EVERYONE know what happened to a player! 01-29-2002 Tails
if (target->player && !target->player->spectator) if (target->player && !target->player->spectator)