Actually solved weapon selection

Also removed the redundant "Player" class