Oh yes. I forgot he was naked during those parts...I think I blocked it out
But yes, I think he IS in his underwear for the sword scene not like FULL ON nude. The only reason he did that was to make sure his clothes didn't weigh him down or something. I think