refactor, fix avatar user on same player problem.