rearranged infect horse to be more like infect player code, also fix npe on arrows