From 4f31d2779db23090fbc005c7282bc1fb061d2686 Mon Sep 17 00:00:00 2001 From: snowleo Date: Thu, 21 Jul 2011 02:09:54 +0200 Subject: [PATCH] Null pointer check for Perm 2.7.4 prefix/suffix --- .../src/com/earth2me/essentials/Permissions2Handler.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Permissions2Handler.java b/Essentials/src/com/earth2me/essentials/Permissions2Handler.java index c588bb5fa..23353c643 100644 --- a/Essentials/src/com/earth2me/essentials/Permissions2Handler.java +++ b/Essentials/src/com/earth2me/essentials/Permissions2Handler.java @@ -9,7 +9,7 @@ import org.bukkit.plugin.Plugin; public class Permissions2Handler implements IPermissionsHandler { private final transient PermissionHandler permissionHandler; - + Permissions2Handler(final Plugin permissionsPlugin) { permissionHandler = ((Permissions)permissionsPlugin).getHandler(); @@ -37,12 +37,13 @@ public class Permissions2Handler implements IPermissionsHandler public String getPrefix(final Player base) { - return permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base)); + final String prefix = permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base)); + return prefix == null ? "" : prefix; } public String getSuffix(final Player base) { - return permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base)); + final String suffix = permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base)); + return suffix == null ? "" : suffix; } - }