Merge branch 'no-free-dunk' into 'master'

Don't count dunking a landmine on yourself for the landmine dunk challenge

See merge request KartKrew/Kart!2346
This commit is contained in:
Oni 2024-05-03 03:21:17 +00:00
commit d7be08d5c8

View file

@ -433,7 +433,9 @@ boolean K_LandMineCollide(mobj_t *t1, mobj_t *t2)
// Banana snipe!
if (t1->health > 1)
{
if (t1->target && t1->target->player)
if (t1->target
&& t1->target->player
&& t2->player != t1->target->player)
{
t1->target->player->roundconditions.landmine_dunk = true;
t1->target->player->roundconditions.checkthisframe = true;