2014-08-18 15:43:17 +00:00
|
|
|
From a0190354c7938e5153b1aafd3a14c76cfe64f242 Mon Sep 17 00:00:00 2001
|
2014-07-21 20:46:54 +00:00
|
|
|
From: md_5 <git@md-5.net>
|
|
|
|
|
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<String, ScoreboardScore> scores = board.getPlayerObjectives(entry);
|
|
|
|
|
+ Map<net.minecraft.server.ScoreboardObjective, ScoreboardScore> 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.9.1
|
|
|
|
|
|
