Revert "[mr2672] Use G3D calculation in GetCombatDistance"

This reverts commit b48ca10dbc558119ef367c2b6585553ddab9dd94.