diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-06-25 16:25:34 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-06-25 16:34:17 +0100 |
commit | 32cda41b70c61343a25d5950fbb6c24ff8cc5199 (patch) | |
tree | 6c4c0a5836d8e499d847c637f7dd6da5a1218af2 | |
parent | 0810d3fa2aaf07b5b5cb9f89341913c1a595c637 (diff) | |
download | Essentials-32cda41b70c61343a25d5950fbb6c24ff8cc5199.tar Essentials-32cda41b70c61343a25d5950fbb6c24ff8cc5199.tar.gz Essentials-32cda41b70c61343a25d5950fbb6c24ff8cc5199.tar.lz Essentials-32cda41b70c61343a25d5950fbb6c24ff8cc5199.tar.xz Essentials-32cda41b70c61343a25d5950fbb6c24ff8cc5199.zip |
Fix null values.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/perm/ZPermissionsHandler.java | 5 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Essentials/src/com/earth2me/essentials/perm/ZPermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/ZPermissionsHandler.java index fda404b4b..740feab3c 100644 --- a/Essentials/src/com/earth2me/essentials/perm/ZPermissionsHandler.java +++ b/Essentials/src/com/earth2me/essentials/perm/ZPermissionsHandler.java @@ -3,7 +3,6 @@ package com.earth2me.essentials.perm; import java.util.ArrayList; import java.util.List; import java.util.Set; - import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -12,11 +11,10 @@ import org.bukkit.event.server.ServiceRegisterEvent; import org.bukkit.plugin.Plugin; import org.tyrannyofheaven.bukkit.zPermissions.ZPermissionsService; + public class ZPermissionsHandler extends SuperpermsHandler implements Listener { - private ZPermissionsService service = null; - private boolean hasGetPlayerPrimaryGroup = false; // This is a post-1.0 addition public ZPermissionsHandler(Plugin plugin) @@ -190,5 +188,4 @@ public class ZPermissionsHandler extends SuperpermsHandler implements Listener return groups.get(0); } } - } diff --git a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java index dac1f5a21..60082e53f 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java +++ b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java @@ -62,7 +62,7 @@ public class KeywordReplacer implements IText } else { - displayName = ipAddress = balance = mails = world = worldTime12 = worldTime24 = worldDate = ""; + displayName = address = ipAddress = balance = mails = world = worldTime12 = worldTime24 = worldDate = ""; } userName = sender.getName(); |