Reflect damage not reduced with 'after damage adjustments for WoE and BG

[anjasoleil1]

Hi guys! I've reported an issue regarding reflect damage in correlation with decreased battleground and woe damage calculation. (here's my report: https://github.com/rathena/rathena/issues/5331) I was wondering if you guys have any solutions?

battle.cpp LINE 7380

Quote

    if (flag & BF_SHORT) {//Bounces back part of the damage.
        if ( (skill_get_inf2(skill_id, INF2_ISTRAP) || !status_reflect) && sd && sd->bonus.short_weapon_damage_return ) {
            rdamage += damage * sd->bonus.long_weapon_damage_return / 100;
            rdamage = i64max(rdamage,1);
        }

I suspect we need to change the calculation. Any thoughts?