From 1a49cdd140bec7b48380ebc0b632937bc241cfc8 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 25 Jun 2013 16:25:34 +0100 Subject: [PATCH] Fix null values. --- .../com/earth2me/essentials/perm/ZPermissionsHandler.java | 5 +---- .../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();