diff --git a/src/game/Objects/Unit.cpp b/src/game/Objects/Unit.cpp index 980cd43aa..e200e3843 100644 --- a/src/game/Objects/Unit.cpp +++ b/src/game/Objects/Unit.cpp @@ -2768,6 +2768,9 @@ uint32 Unit::CalculateDamage(WeaponAttackType attType, bool normalized, uint8 in } } + if (min_damage < 0) min_damage = 0.0f; + if (max_damage < 0) max_damage = 0.0f; + if (min_damage > max_damage) std::swap(min_damage, max_damage); diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 5dfe6433e..1dd37eb22 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -430,6 +430,7 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, fl { base_value = 0.0f; total_value = 0.0f; + total_phys = 0.0f; } min_damage = ((base_value + weapon_mindamage) * base_pct + total_value + total_phys) * total_pct;