summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ward <chris@chrisgward.com>2013-12-07 14:20:51 +1100
committerChris Ward <chris@chrisgward.com>2013-12-07 14:20:51 +1100
commit1a58e3f6df8e738301b0978152f46911cce566fc (patch)
tree574b3e74d315a4dd5639d32ed5111e3aea70b2f9
parentbd61719dcdddead43e7c5237b042bda21fe53222 (diff)
downloadEssentials-1a58e3f6df8e738301b0978152f46911cce566fc.tar
Essentials-1a58e3f6df8e738301b0978152f46911cce566fc.tar.gz
Essentials-1a58e3f6df8e738301b0978152f46911cce566fc.tar.lz
Essentials-1a58e3f6df8e738301b0978152f46911cce566fc.tar.xz
Essentials-1a58e3f6df8e738301b0978152f46911cce566fc.zip
Disable the login message hooks automatically
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 99cf233da..1382fa4a5 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -195,7 +195,10 @@ public class EssentialsPlayerListener implements Listener
delayedJoin(event.getPlayer(), joinMessage);
}
});
- event.setJoinMessage(null);
+ if(ess.getSettings().allowSilentJoinQuit() || ess.getSettings().isCustomJoinMessage())
+ {
+ event.setJoinMessage(null);
+ }
}
public void delayedJoin(final Player player, final String message)
@@ -261,10 +264,6 @@ public class EssentialsPlayerListener implements Listener
.replace("{USERNAME}", player.getName())
);
}
- else
- {
- ess.getServer().broadcastMessage(message);
- }
if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
{