From 48d9ecee255751f088c2772d8d8981fd82ed5605 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 23 Sep 2023 22:31:54 -0700 Subject: [PATCH] Fix team sidebar objectives not being cleared Objectives displayed in team sidebars were not cleared when switching scoreboards. If a player's scoreboard has a displayed objective for the 'gold' sidebar, and their scoreboard was switched to one where they still had a 'gold' team, it would still be displayed --- .../bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java index c7ca6210d6..f3184be385 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -87,8 +87,8 @@ public final class CraftScoreboardManager implements ScoreboardManager { // Old objective tracking HashSet removed = new HashSet<>(); - for (int i = 0; i < 3; ++i) { - Objective scoreboardobjective = oldboard.getDisplayObjective(net.minecraft.world.scores.DisplaySlot.BY_ID.apply(i)); + for (net.minecraft.world.scores.DisplaySlot slot : net.minecraft.world.scores.DisplaySlot.values()) { // Paper - clear all display slots + Objective scoreboardobjective = oldboard.getDisplayObjective(slot); // Paper - clear all display slots if (scoreboardobjective != null && !removed.contains(scoreboardobjective)) { entityplayer.connection.send(new ClientboundSetObjectivePacket(scoreboardobjective, 1)); removed.add(scoreboardobjective);