1 files changed, 17 insertions, 18 deletions
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
index 8788d755d..04c49b698 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
@@ -37,36 +37,35 @@ public class EssentialsLocalChatEventListener implements Listener
 		{
 			String type = _("chatTypeLocal");
 			final IUser user = ess.getUser(onlinePlayer);
-			//TODO: remove reference to op 
-			if (user.isIgnoringPlayer(sender.getName()) && !sender.isOp())
+			if (user.isIgnoringPlayer(ess.getUser(sender)))
 			{
 				continue;
 			}
 			if (!user.equals(sender))
 			{
-				if (Permissions.CHAT_SPY.isAuthorized(user))
+				boolean abort = false;
+				final Location playerLoc = user.getLocation();
+				if (playerLoc.getWorld() != world)
 				{
-					type = type.concat(_("chatTypeSpy"));
+					abort = true;
 				}
-				else
+				final double delta = playerLoc.distanceSquared(loc);
+
+				if (delta > event.getRadius())
 				{
-					final Location playerLoc = user.getLocation();
-					if (playerLoc.getWorld() != world)
-					{
-						continue;
-					}
-					final double delta = playerLoc.distanceSquared(loc);
+					abort = true;
+				}
 
-					if (delta > event.getRadius())
+				if (abort)
+				{
+					if (ChatPermissions.getPermission("spy").isAuthorized(user))
 					{
-						continue;
+						type = type.concat(_("chatTypeSpy"));
 					}
 				}
-
-				final String message = type.concat(String.format(event.getFormat(), sender.getDisplayName(), event.getMessage()));
-				user.sendMessage(message);
 			}
+			final String message = type.concat(String.format(event.getFormat(), sender.getDisplayName(), event.getMessage()));
+			user.sendMessage(message);
 		}
-	
 	}
-}
-\ No newline at end of file
+}