Fix bugs with combat distanceEffect