spigot-mirror/craftbukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git synced 2025-08-21 05:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 {