Changes to AbstractWeapon and stick