testserver/CraftBukkit-Patches/0110-Add-Score.isScoreSet-Z...

38 lines
1.5 KiB
Diff
Raw Normal View History

2015-01-05 03:32:01 +00:00
From 841b7b53e512708e6b7200f88dbe75f502239010 Mon Sep 17 00:00:00 2001
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
2014-11-28 01:17:45 +00:00
index c7d3657..05f72df 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();
2014-11-28 01:17:45 +00:00
@@ -60,9 +60,11 @@ final class CraftScore implements Score {
}
2014-11-28 01:17:45 +00:00
// Spigot start
- @Override
+ @Override
2014-11-28 01:17:45 +00:00
public boolean isScoreSet() throws IllegalStateException {
- throw new UnsupportedOperationException("Not supported yet.");
+ Scoreboard board = objective.checkState().board;
+
+ return board.getPlayers().contains(entry) && board.getPlayerObjectives(entry).containsKey(objective.getHandle());
}
2014-11-28 01:17:45 +00:00
// Spigot end
}
--
2014-11-28 01:17:45 +00:00
2.1.0