From f726035660de57eb4ba4e6a962c14caffe523482 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Mon, 26 May 2014 22:08:18 +0100 Subject: Don't check silentjoin.vanish if another plugin has hidden the join message. --- .../src/com/earth2me/essentials/EssentialsPlayerListener.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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( -- cgit v1.2.3