fix some minor issues with the weapon changes

* fix bug: sometimes the weapon dissapears with collecting a weapon item