Feature #1289 NPCs return to default position

Make stationary NPCs return to their previous position once combat/crime AI finishes.