From 128b2e548c134b9cfc9dfd4a3d14093f19cb8e4a Mon Sep 17 00:00:00 2001 From: Ashnal Date: Sun, 24 Aug 2025 09:28:16 -0400 Subject: [PATCH] Fix Stone Shoe damage downgrade crash --- src/p_inter.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 1d580e371..b8f3e5a94 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -3276,9 +3276,13 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da if (source && source != player->mo && source->player) { - // Stone Shoe handles amps on its own - if (inflictor->type != MT_STONESHOE && inflictor->type != MT_STONESHOE_CHAIN) + // Stone Shoe handles amps on its own, but this is also a good place to set soften tumble for it + if (inflictor->type == MT_STONESHOE || inflictor->type == MT_STONESHOE_CHAIN) + softenTumble = true; + else K_SpawnAmps(source->player, K_PvPAmpReward((type == DMG_WHUMBLE) ? 30 : 20, source->player, player), target); + + K_BotHitPenalty(player); if (G_SameTeam(source->player, player)) @@ -3476,9 +3480,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da ringburst = 0; break; case DMG_TUMBLE: - if (inflictor->type == MT_STONESHOE || inflictor->type == MT_STONESHOE_CHAIN) - softenTumble = true; - K_TumblePlayer(player, inflictor, source, softenTumble); ringburst = 10; break;