Switches Weapon if Arrow is Selected

I'm not sure why i didn't do this before, i had switch weapon commented but forgot about it

fixes #1447