diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-06-16 16:05:48 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-06-16 16:05:48 +0100 |
commit | fbd0d27ac48d3c88007b73d81e70715d0791e940 (patch) | |
tree | dcb4f3588052e9512de92e1d13948f10ad3ede26 /EssentialsChat/src/com/earth2me | |
parent | 93ec005d58a367ef88a0fc21735563740c6f70d6 (diff) | |
download | Essentials-fbd0d27ac48d3c88007b73d81e70715d0791e940.tar Essentials-fbd0d27ac48d3c88007b73d81e70715d0791e940.tar.gz Essentials-fbd0d27ac48d3c88007b73d81e70715d0791e940.tar.lz Essentials-fbd0d27ac48d3c88007b73d81e70715d0791e940.tar.xz Essentials-fbd0d27ac48d3c88007b73d81e70715d0791e940.zip |
Fix chat showing [spy] prefix when social spy was not required to see the message.
Fixes #2263
Diffstat (limited to 'EssentialsChat/src/com/earth2me')
-rw-r--r-- | EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java index c67cb6a64..c65eb5a0e 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java @@ -127,23 +127,26 @@ public abstract class EssentialsChatPlayer implements Listener } if (!onlineUser.equals(sender)) { - if (onlineUser.isAuthorized("essentials.chat.spy")) - { - type = type.concat(_("chatTypeSpy")); - } - else - { + boolean abort = false; final Location playerLoc = onlineUser.getLocation(); if (playerLoc.getWorld() != world) { - continue; + abort = true; } final double delta = playerLoc.distanceSquared(loc); if (delta > chatStore.getRadius()) { - continue; + abort = true; } - } + if (abort) { + if (onlineUser.isAuthorized("essentials.chat.spy")) + { + type = type.concat(_("chatTypeSpy")); + } + else + { + continue; + } } String message = String.format(event.getFormat(), type.concat(sender.getDisplayName()), event.getMessage()); |