From dd8cca3882a1d651213c0fa7208863e5e4be6222 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 5 Jan 2024 14:18:13 +1100 Subject: [PATCH] SPIGOT-7562: Fix Score#getScore and Score#isScoreSet --- .../org/bukkit/craftbukkit/scoreboard/CraftScore.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java index a804b360e..2c11f70d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java @@ -42,11 +42,9 @@ final class CraftScore implements Score { public int getScore() { Scoreboard board = objective.checkState().board; - if (board.getTrackedPlayers().contains(entry)) { // Lazy - ReadOnlyScoreInfo score = board.getPlayerScoreInfo(entry, objective.getHandle()); - if (score != null) { // Lazy - return score.value(); - } + ReadOnlyScoreInfo score = board.getPlayerScoreInfo(entry, objective.getHandle()); + if (score != null) { // Lazy + return score.value(); } return 0; // Lazy @@ -61,7 +59,7 @@ final class CraftScore implements Score { public boolean isScoreSet() { Scoreboard board = objective.checkState().board; - return board.getTrackedPlayers().contains(entry) && board.getPlayerScoreInfo(entry, objective.getHandle()) != null; + return board.getPlayerScoreInfo(entry, objective.getHandle()) != null; } @Override