Minor change to Player.update() to make code more consistent
merge fix