From 0bfc70e98aa680f45e32d239afc5c75e045a6d49 Mon Sep 17 00:00:00 2001 From: zml Date: Wed, 28 Aug 2013 20:27:00 -0700 Subject: [PATCH] Check that animal owner is not null before name-based permission check --- .../java/ru/tehkode/modifyworld/ModifyworldListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/tehkode/modifyworld/ModifyworldListener.java b/src/main/java/ru/tehkode/modifyworld/ModifyworldListener.java index 5295a79..b790149 100644 --- a/src/main/java/ru/tehkode/modifyworld/ModifyworldListener.java +++ b/src/main/java/ru/tehkode/modifyworld/ModifyworldListener.java @@ -72,7 +72,7 @@ public abstract class ModifyworldListener implements Listener { } else if (entity instanceof Tameable) { 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; } - + private String getInventoryTypePermission(InventoryType type) { return formatEnumString(type.name()); } @@ -179,7 +179,7 @@ public abstract class ModifyworldListener implements Listener { private void registerEvents(Plugin plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin); } - + private String formatEnumString(String enumName) { return enumName.toLowerCase().replace("_", ""); }