Did I do the right thing? Or did I break his heart?

First of all how is that a joke? isn't he your friend? i wouldn't joke about that with a friend seriously. You need to apologize to him either confront him or you can just try to talk to him again naturally. Start a conversation about any common interests. Just be nice to him. and don't play around again, be more mature.