Fix of Rifle bug part1
Revert "Fix of Rifle bug part1"

This reverts commit e79d1ad9d01ae3e907fab83ba75cf544e067ceb3.
Merge remote-tracking branch 'upstream/master'
Analyzed rifle bug
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master' into RifleBugFix
Little fix for WeaponObject Commit
Merge pull request #1115 from CharonInferar/RifleBugFix

Little fix for Weapon Object commit