Toymaker does not have to have returned home. It is possible he is still at the school, but we just won't really mention him that much. It can even be implied that he has started making friends with the others. It just might happen that he isn't there when the big events occur, or he is just somewhere in the background. If that is the case, Autumn could definitely have her dragon.