Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-04 14:41:29 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-438: Correct CraftScoreboard.getObjective NPEing instead of returning null for missing objectives

Browse Source
This commit is contained in:
Thinkofdeath 2015-01-17 23:10:08 +00:00
parent 00eba538b0
commit 59dd2ddb9d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
View File

@ -37,7 +37,8 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
public Objective getObjective(String name) throws IllegalArgumentException { public Objective getObjective(String name) throws IllegalArgumentException {
Validate.notNull(name, "Name cannot be null"); Validate.notNull(name, "Name cannot be null");
return new CraftObjective(this, board.getObjective(name)); ScoreboardObjective nms = board.getObjective(name);
return nms == null ? null : new CraftObjective(this, nms);
} }
public ImmutableSet<Objective> getObjectivesByCriteria(String criteria) throws IllegalArgumentException { public ImmutableSet<Objective> getObjectivesByCriteria(String criteria) throws IllegalArgumentException {