mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-15 04:05:50 -07:00
Merge
This commit is contained in:
@@ -10,20 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
|
||||
@@ -0,0 +0,0 @@ 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();
|
||||
@@ -0,0 +0,0 @@ final class CraftScore implements Score {
|
||||
}
|
||||
|
||||
// Spigot start
|
||||
- @Override
|
||||
+ @Override
|
||||
@Override
|
||||
public boolean isScoreSet() throws IllegalStateException {
|
||||
- throw new UnsupportedOperationException("Not supported yet.");
|
||||
+ Scoreboard board = objective.checkState().board;
|
||||
|
Reference in New Issue
Block a user