Combat: Removing duplicate range check code

This actually fixes a bug as some parts of the code were still using
Euclidean instead of Manhattan distance.