Upstream
/
Modifyworld
mirror of https://github.com/PEXPlugins/Modifyworld.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check that animal owner is not null before name-based permission check

This commit is contained in:
zml 2013-08-28 20:27:00 -07:00
parent fe91279f9e
commit 0bfc70e98a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ru/tehkode/modifyworld/ModifyworldListener.java
View File

@ -72,7 +72,7 @@ public abstract class ModifyworldListener implements Listener {
} else if (entity instanceof Tameable) { } else if (entity instanceof Tameable) {
Tameable animal = (Tameable) entity; Tameable animal = (Tameable) entity;
return "animal." + entityName + (animal.isTamed() ? "." + animal.getOwner().getName() : ""); return "animal." + entityName + (animal.isTamed() && animal.getOwner() != null ? "." + animal.getOwner().getName() : "");
} }
@ -84,7 +84,7 @@ public abstract class ModifyworldListener implements Listener {
return category.getNameDot() + entityName; return category.getNameDot() + entityName;
} }
private String getInventoryTypePermission(InventoryType type) { private String getInventoryTypePermission(InventoryType type) {
return formatEnumString(type.name()); return formatEnumString(type.name());
} }
@ -179,7 +179,7 @@ public abstract class ModifyworldListener implements Listener {
private void registerEvents(Plugin plugin) { private void registerEvents(Plugin plugin) {
plugin.getServer().getPluginManager().registerEvents(this, plugin); plugin.getServer().getPluginManager().registerEvents(this, plugin);
} }
private String formatEnumString(String enumName) { private String formatEnumString(String enumName) {
return enumName.toLowerCase().replace("_", ""); return enumName.toLowerCase().replace("_", "");
} }