Merge pull request #246 from ping19/master

Fix auto firing when switching to weapon1