Scoreboard restore updated to restore per-player scoreboard instead

With this players with a "per-player" scoreboard instead of main one get it back well. Those who has the main one get it too.