My suggestion is simple, add a 6 second delay for getting the criminal job when entering the riot area. You may ask why? Well this is particularly annoying because when being a gangster and just driving by the riot area and then immediately when you enter the zone your occupation gets switched to criminal. Adding a delay like this won't interrupt any of the riot activity, but rather be useful for players that are just passing by and does not want to attend the riot, especially nowadays when riots are moved between basically every store in Los Santos and not just kept in the old riot areas.
Riots are quite visibly demarcated, so I don't see why this is necessary.
Happened to me a few times, flying with a hijack above a riot area then getting ejected/falling/dying
Test it yourself next riot, why would I make this up