That would be called Calm Emotions higher level spell. Stops Barbarian's from raging as well.
Cool. Bards make good babysitters!
Okay I think I am confused here, do you see nothing wrong with the that situation?
I saw the episode of Buffy where Willow mind controlled her girlfriend Tara, I understand the issue here. My point is that if you make different assumptions about charm person, it might not qualify as mind control.
All in all, I think it might be better for me to give up on redefining charm person and just rewrite it to say "you get +20 on diplomacy checks against target player."