thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-flingring-null-deref' into 'master'

Browse source 
Fix null dereference when removing baildrop flingrings

Closes ring-racers#134 and ring-racers#155

See merge request kart-krew-dev/ring-racers-internal!2875
This commit is contained in:
Oni VelocitOni 2025-09-19 01:18:11 +00:00
commit 481b825d5e
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_enemy.c
View file

@ -3514,10 +3514,14 @@ void A_AttractChase(mobj_t *actor)
// 1. Insta-Whip's extended punish window used to delete flingrings off you while they were attracting
// 2. ALL conditions that deleted flingrings off you didn't decrement pickuprings, desyncing your ring count
boolean stale = (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player);
boolean blocked = false;
boolean blocked = (actor->target->player->baildrop);
if (G_CompatLevel(0x0010))
blocked |= !!(actor->target->player->bailcharge || actor->target->player->defenseLockout > PUNISHWINDOW);
if (!stale)
{
blocked = actor->target->player->baildrop;
if (G_CompatLevel(0x0010))
blocked |= !!(actor->target->player->bailcharge || actor->target->player->defenseLockout > PUNISHWINDOW);
}
if (!G_CompatLevel(0x0010) || actor->extravalue2)
{