diff --git a/src/k_collide.c b/src/k_collide.c index 242130a18..95fe28983 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -897,21 +897,6 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) return true; } - // Cause stumble on scale difference - t1Condition = (t1->scale > t2->scale + (mapobjectscale/8)); - t2Condition = (t2->scale > t1->scale + (mapobjectscale/8)); - - if (t1Condition == true && t2Condition == false) - { - K_StumblePlayer(t2->player); - return true; - } - else if (t1Condition == false && t2Condition == true) - { - K_StumblePlayer(t1->player); - return true; - } - // Flame Shield dash damage t1Condition = (t1->player->flamedash > 0 && t1->player->itemtype == KITEM_FLAMESHIELD); t2Condition = (t2->player->flamedash > 0 && t2->player->itemtype == KITEM_FLAMESHIELD); @@ -950,6 +935,21 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2) } } + // Cause stumble on scale difference + t1Condition = (t1->scale > t2->scale + (mapobjectscale/8)); + t2Condition = (t2->scale > t1->scale + (mapobjectscale/8)); + + if (t1Condition == true && t2Condition == false) + { + K_StumblePlayer(t2->player); + return true; + } + else if (t1Condition == false && t2Condition == true) + { + K_StumblePlayer(t1->player); + return true; + } + // Ring sting, this is a bit more unique t1Condition = (K_GetShieldFromItem(t2->player->itemtype) == KSHIELD_NONE); t2Condition = (K_GetShieldFromItem(t1->player->itemtype) == KSHIELD_NONE);