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

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot 2015-01-17 23:10:08 +00:00
parent 06a42b5a28
commit 9adc314b7e

View file

@ -37,7 +37,8 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
public Objective getObjective(String name) throws IllegalArgumentException {
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 {