Don't think he's right to punch you but you should definitly offer to smoke him out as an apology, I'm sure it'll set things straight.