Added a simpler alternative to checkAndSetWeapon