mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
Merge branch 'allow-hitlag-explode' into 'master'
Fix Eggmark not activating on players in precisely timed hitlag Closes ring-racers#259 See merge request kart-krew-dev/ring-racers-internal!2899
This commit is contained in:
commit
e7ee7ec9ce
1 changed files with 1 additions and 1 deletions
|
|
@ -4050,7 +4050,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inflictor && !P_MobjWasRemoved(inflictor) && inflictor->momx == 0 && inflictor->momy == 0 && inflictor->momz == 0)
|
if (inflictor && !P_MobjWasRemoved(inflictor) && inflictor->momx == 0 && inflictor->momy == 0 && inflictor->momz == 0 && inflictor->type != MT_SPBEXPLOSION)
|
||||||
{
|
{
|
||||||
// Probably a map hazard.
|
// Probably a map hazard.
|
||||||
allowcombo = false;
|
allowcombo = false;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue