Friend points an unloaded gun at me intentionally. Did I respond appropriately here?

This may be a bit long winded, so bear with me. TLDR at the end.A friend of mine for some years whom I had introduced to firearms and firearm safety had a confrontation with me recently. When we met, he had a limited understanding of firearm safety, but initially stated otherwise. When I first showed him my carry gun, he proceeded to point it at me with his booger hook on the bang switch. I quickly, firmly, and politely corrected this and we had a discussion about the top 4 rules of gun safety. Now, this isn’t the part I’m upset about.As time goes on, we go to the range and get some training in together. He becomes more and more interested in carrying himself, which I encourage as overall he seems a responsible adult. We talk about carry options for a few weeks and he eventually opts to get a Glock 19.Skip ahead a few months and we’re at a bar getting some drinks after each of us gets off work. I’m carrying (as in my state it’s legal to do so at a bar). Afterwards he wants to invite me and a mutual friend back to his place to hang out for a bit. When we get there, he’s excited to show off his new gun. I’m hesitant at first because we’ve had a few, but he seems to know how to be safe, so I don’t say much about it.He comes back out of his room with his G19 in hand (loaded) and as he’s clearing it I jokingly say “just don’t point a gun at me again”. That’s when he points it directly at my head about a foot away. I angrily slap his hand away, knocking the gun down and yell at him. Our mutual friend exclaims that he doesn’t feel comfortable and wants to leave. I don’t remember exactly what I said, but some heated words were exchanged and he told me to leave.The last thing I said to him before leaving (and I regret it now) is “you better have a round in the chamber the next time you point a gun at me, because there will be one in mine”.After thinking about it, that was some dumb shit to say and could only have escalated things, but I was pissed. I haven’t spoken to him since and avoid the possibility of seeing him in our small town.How would you have handled this and what could I have done better? Obviously not being in the room when someone wants to show off their gun after coming back from the bar is at the top of the list.TLDR: Friend of mine bought a CCW and wanted to show it off to a mutual friend after coming back from the bar. He pointed it at me and I slapped it away then got in a heated argument with him. via /r/CCW https://ift.tt/2pNyTP7