This moves some logic from the "Garrisoned"-state in UnitAI's "Garrison"-state to the "Approaching"-state of the same parent state where it seems more fit.
It is strange why one would enter the "Garrisoned"-state, even when garrisoning would fail and then going back to the "Approaching"-state. Hence, range and the ability to garrison checks are now peformed earlier.