From ff88954cd61861bd5bf8a26feeca291491e90fa0 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Apr 2014 19:35:53 +1000 Subject: [PATCH] Add Score.isScoreSet()Z API. Also fix generics on CraftScore.getScore()I. diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java index 7095f6d..b265616 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java @@ -41,7 +41,7 @@ final class CraftScore implements Score { Scoreboard board = objective.checkState().board; if (board.getPlayers().contains(entry)) { // Lazy - Map scores = board.getPlayerObjectives(entry); + Map scores = board.getPlayerObjectives(entry); // Spigot ScoreboardScore score = scores.get(objective.getHandle()); if (score != null) { // Lazy return score.getScore(); @@ -55,6 +55,15 @@ final class CraftScore implements Score { objective.checkState().board.getPlayerScoreForObjective(entry, objective.getHandle()).setScore(score); } + // Spigot start + @Override + public boolean isScoreSet() throws IllegalStateException { + Scoreboard board = objective.checkState().board; + + return board.getPlayers().contains(entry) && board.getPlayerObjectives(entry).containsKey(objective.getHandle()); + } + // Spigot end + public CraftScoreboard getScoreboard() { return objective.getScoreboard(); } -- 1.8.3.2