summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java6
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(