From 3c09716a7873584e272d0ef3a50ed48ad2cd22d2 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sat, 22 Feb 2025 22:07:02 -0500 Subject: [PATCH] Fix selfhit playing hitem --- src/p_inter.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index d6c87b723..5f1512a80 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2197,10 +2197,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da } // We successfully damaged them! Give 'em some bumpers! - if (gametyperules & GTR_BUMPERS) + if (source && source != player->mo && source->player) { - - if (source && source != player->mo && source->player) + if (gametyperules & GTR_BUMPERS) { K_BattleAwardHit(source->player, player, inflictor, 1); @@ -2225,13 +2224,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da K_DestroyBumpers(player, 1); } } - else - { - K_DestroyBumpers(player, 1); - } - } - K_TryHurtSoundExchange(target, source); + K_TryHurtSoundExchange(target, source); + } if (!((damagetype & DMG_NORMAL) || (damagetype & DMG_WIPEOUT))) player->sneakertimer = 0;