Funny you should mention that actually, as he is moving quite far away, unforunately, in a month I'm moving closer to him and he wants to come visit -ugh.
Although if he did visit and try anything like that again, I'm pretty sure my boyfriend would comply with the above suggestions and smack him...