incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only Drop rings if mobj2 is a player

Browse source
This commit is contained in:
NepDisk 2025-05-19 17:16:08 -04:00
parent 6e8e027a6e
commit fbccc955c9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_kart.c
View file

@ -2052,7 +2052,7 @@ boolean K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean sol
mobj1->player->justbumped = bumptime;
// Moved here so it only fires once on bump.
if ((mobj1->player->rings > 0) && (K_GetShieldFromPlayer(mobj1->player) == KSHIELD_NONE))
if (mobj2->player && (mobj1->player->rings > 0) && (K_GetShieldFromPlayer(mobj1->player) == KSHIELD_NONE))
{
P_PlayerRingBurst(mobj1->player, 1);
}
@ -2072,7 +2072,7 @@ boolean K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean sol
mobj2->player->justbumped = bumptime;
// Moved here so it only fires once on bump.
if ((mobj2->player->rings > 0) && (K_GetShieldFromPlayer(mobj2->player) == KSHIELD_NONE))
if (mobj1->player && (mobj2->player->rings > 0) && (K_GetShieldFromPlayer(mobj2->player) == KSHIELD_NONE))
{
P_PlayerRingBurst(mobj2->player, 1);
}