diff options
| author | KHobbits <rob@khobbits.co.uk> | 2014-05-26 22:08:18 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2014-05-26 22:08:18 +0100 |
| commit | 01a84d069f5486182bff7dc22d9419b474cc1033 (patch) | |
| tree | 814ff35e1f1975cc7541708e5927cac27dca3b20 | |
| parent | 2d157c32384cb92310297ceae4fd557bfc2cf123 (diff) | |
| download | Essentials-01a84d069f5486182bff7dc22d9419b474cc1033.tar Essentials-01a84d069f5486182bff7dc22d9419b474cc1033.tar.gz Essentials-01a84d069f5486182bff7dc22d9419b474cc1033.tar.lz Essentials-01a84d069f5486182bff7dc22d9419b474cc1033.tar.xz Essentials-01a84d069f5486182bff7dc22d9419b474cc1033.zip | |
Don't check silentjoin.vanish if another plugin has hidden the join message.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 2b3f598df..980c0e030 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -279,13 +279,17 @@ public class EssentialsPlayerListener implements Listener user.getBase().setSleepingIgnored(true); } - if ((ess.getSettings().allowSilentJoinQuit() && (user.isAuthorized("essentials.silentjoin") || user.isAuthorized("essentials.silentjoin.vanish"))) || message == null) + if (ess.getSettings().allowSilentJoinQuit() && (user.isAuthorized("essentials.silentjoin") || user.isAuthorized("essentials.silentjoin.vanish"))) { if (user.isAuthorized("essentials.silentjoin.vanish")) { user.setVanished(true); } } + else if (message == null) + { + //NOOP + } else if (ess.getSettings().isCustomJoinMessage()) { ess.getServer().broadcastMessage( |