Merge pull request #443 from SkyblockerMod/1.20.3

1.20.3

1 files changed, 12 insertions, 9 deletions

diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index 02b1637b..22601c98 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -266,18 +266,21 @@ public class Utils {
             ObjectArrayList<Text> textLines = new ObjectArrayList<>();
             ObjectArrayList<String> stringLines = new ObjectArrayList<>();
 
-            for (ScoreboardPlayerScore score : scoreboard.getAllPlayerScores(objective)) {
-                Team team = scoreboard.getPlayerTeam(score.getPlayerName());
+            for (ScoreHolder scoreHolder : scoreboard.getKnownScoreHolders()) {
+                //Limit to just objectives displayed in the scoreboard (specifically sidebar objective)
+                if (scoreboard.getScoreHolderObjectives(scoreHolder).containsKey(objective)) {
+                    Team team = scoreboard.getScoreHolderTeam(scoreHolder.getNameForScoreboard());
 
-                if (team != null) {
-                    Text textLine = Text.empty().append(team.getPrefix().copy()).append(team.getSuffix().copy());
-                    String strLine = team.getPrefix().getString() + team.getSuffix().getString();
+                    if (team != null) {
+                        Text textLine = Text.empty().append(team.getPrefix().copy()).append(team.getSuffix().copy());
+                        String strLine = team.getPrefix().getString() + team.getSuffix().getString();
 
-                    if (!strLine.trim().isEmpty()) {
-                        String formatted = Formatting.strip(strLine);
+                        if (!strLine.trim().isEmpty()) {
+                            String formatted = Formatting.strip(strLine);
 
-                        textLines.add(textLine);
-                        stringLines.add(formatted);
+                            textLines.add(textLine);
+                            stringLines.add(formatted);
+                        }
                     }
                 }
             }