Fix weapon cycle getting stuck for same item IDs