fixes weapons
Merge pull request #1442 from CalebJohn/weapon-fix

Melee Weapons no longer crash