I (sort of) had a gun pulled on me while driving for Uber. Did I do the right thing?

Ok so this happened about a month ago at the time of posting. Everything has been resolved and I'm curious about what anyone else thinks about my actions, what I should have done, etc. No real names are used for the people to respect privacy.

It was late at night on March 7th when I pulled up to a bar to pick up a passenger. It turned out to be for her boyfriend (I think(who will be called Bob), and his friend (who will be called Joe), as they were very drunk. When she went to get them, along with the rest of the group, Bob and Joe were not happy about leaving and went in line to get back into the bar. They had a bit of a fight with some of the other people in the line and Joe ended up breaking a window of a business next to the bar. He was freaking out and Bob was saying that he was going to get arrested. Joe then started pulling a gun out from his pants and was beginning to threaten others.

I made the not-so-wise decision to take them away from the bar, as I did not want to be a witness and/or victim in a shooting caused by a drunk and angry man. Before they got in the car, Joe's girlfriend (who will be called Jane) grabbed the gun and took it away from Joe. While in the car, Joe got the gun back from Jane and he started to point it at me behind the seat. Jane saw this, freaked out, and quickly wrestled the gun out of Joe's hands. I got all of them where they needed to go, parked in an empty parking lot and recollected myself for a bit, and went to speak with an officer about what happened. They did arrest him and charged him, but only for the property damage and not for the gun stuff.

I don't know how to prove this is real without doxing myself, especially given that people lie on the internet (insert Buster Baxter line about lying on the internet here). I do have a business card with the case number on it, but since the officer closed the case I don't know what info they can provide to anyone that just calls them up asking questions about it.

So that's the time when I had someone (sort of) pull a gun on me. All I can say is that I'm glad I'm not driving for Uber anymore.