Fixed weapon autoswitch, broken by previous commits