Skip to content

Commit

Permalink
Cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
aufdemrand committed Jul 7, 2013
1 parent 63d0c99 commit ece57f9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/main/java/net/aufdemrand/denizen/objects/dNPC.java
Expand Up @@ -93,15 +93,15 @@ public EntityLiving getHandle() {
public NPC getCitizen() {
NPC npc = CitizensAPI.getNPCRegistry().getById(npcid);
if (npc == null)
dB.log("Uh oh! Denizen has encountered an NPE while trying to fetch a NPC. Has this NPC been removed?");
dB.log("Uh oh! Denizen has encountered a NPE while trying to fetch a NPC. Has this NPC been removed?");
return npc;
}

public LivingEntity getEntity() {
try {
return getCitizen().getBukkitEntity();
} catch (NullPointerException e) {
dB.log("Uh oh! Denizen has encountered an NPE while trying to fetch a NPC entity. Has this NPC been removed?");
dB.log("Uh oh! Denizen has encountered a NPE while trying to fetch a NPC entity. Has this NPC been removed?");
return null;
}
}
Expand Down
Expand Up @@ -105,7 +105,7 @@ public List<ScriptEntry> getEntries(dPlayer player, dNPC npc, String path) {
}

public boolean checkCooldown(dPlayer player) {
return DenizenAPI._commandRegistry().get(CooldownCommand.class).checkCooldown(player.getName(), name);
return CooldownCommand.checkCooldown(player.getName(), name);
}

}

0 comments on commit ece57f9

Please sign in to comment.