Sounds like he's douching it up for you. Read some of the stuff on natural game, being alpha and being confident. this is a great link for that.
body-language-the-key-to-natural-game-vt71495.html
Practice being alpha in the mirror. Give yourself the best alpha stance, with eye contact, head up, chest out (not so much you look stupid).
Put yourself in the alpha aggressive mindset. By this I don't mean be an ego-filled douche, I mean be a confident and maybe even a little intimidating person. This does not mean not to smile, this means that you're gonna have a good time, but you won't take other guys shit.
When you see him again, make eye contact, don't look away, don't smile, say something to this essence in a serious tone (might wanna practice the serious tone in the mirror too), "Stop giving me shit. I'm not going to take it." to any snide remark, don't say anything. Use your eyes to convey your message.
And yes. game Samantha. He might be your friend, but from the sound of it, you're currently his bitch.