[Improve] Player event handler