Use entity instead of player object