A.A.
My son didn't have night terrors... he just was getting up in the night for a while there... it lasted for a month or two, I think, and then stopped. We do have a nightlight in his room - but I think that came long after he stopped waking up and coming in to our room. You're doing well just comforting, calming and putting him back in bed... it takes patience, and seems like it will go on forever - don't worry, it won't. Good luck and good sleeping!