Split moveOrAttack and let client do yet a bit more of running