Tide: Improve Player Listener Logic