Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-17 04:41:31 +01:00
Code Issues Projects Releases Wiki Activity

Remove possible NPE from trait plotting

Browse Source
This commit is contained in:
fullwall 2018-03-09 22:33:09 +08:00
parent 8054667482
commit dd53b5eefa
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/net/citizensnpcs/npc/CitizensTraitFactory.java
View File

@ -101,7 +101,7 @@ public class CitizensTraitFactory implements TraitFactory {
public void addPlotters(Graph graph) { public void addPlotters(Graph graph) {
for (Map.Entry<String, TraitInfo> entry : registered.entrySet()) { for (Map.Entry<String, TraitInfo> entry : registered.entrySet()) {
if (INTERNAL_TRAITS.contains(entry.getKey())) if (INTERNAL_TRAITS.contains(entry.getKey()) || entry.getKey() == null)
continue; continue;
final Class<? extends Trait> traitClass = entry.getValue().getTraitClass(); final Class<? extends Trait> traitClass = entry.getValue().getTraitClass();
graph.addPlotter(new Metrics.Plotter(entry.getKey()) { graph.addPlotter(new Metrics.Plotter(entry.getKey()) {
@ -109,9 +109,10 @@ public class CitizensTraitFactory implements TraitFactory {
public int getValue() { public int getValue() {
int numberUsingTrait = 0; int numberUsingTrait = 0;
for (NPC npc : CitizensAPI.getNPCRegistry()) { for (NPC npc : CitizensAPI.getNPCRegistry()) {
if (npc.hasTrait(traitClass)) if (npc.hasTrait(traitClass)) {
++numberUsingTrait; ++numberUsingTrait;
} }
}
return numberUsingTrait; return numberUsingTrait;
} }
}); });

3
main/src/main/java/net/citizensnpcs/npc/skin/Skin.java
View File

@ -89,6 +89,9 @@ public class Skin {
setNPCTexture(entity, localData); setNPCTexture(entity, localData);
// check if NPC prefers to use cached skin over the latest skin. // check if NPC prefers to use cached skin over the latest skin.
if (entity.getNPC().data().has("player-skin-use-latest")) {
entity.getNPC().data().remove("player-skin-use-latest");
}
if (!entity.getNPC().data().get(NPC.PLAYER_SKIN_USE_LATEST, Setting.NPC_SKIN_USE_LATEST.asBoolean())) { if (!entity.getNPC().data().get(NPC.PLAYER_SKIN_USE_LATEST, Setting.NPC_SKIN_USE_LATEST.asBoolean())) {
// cache preferred // cache preferred
return true; return true;