Same team fix and clean-up

Fixed same team checks to prevent player from receiving TK points when
he/she is about to be moved to another team.