diff options
author | Chris Ward <chris@chrisgward.com> | 2013-12-07 13:44:41 +1100 |
---|---|---|
committer | Chris Ward <chris@chrisgward.com> | 2013-12-07 13:44:41 +1100 |
commit | bd61719dcdddead43e7c5237b042bda21fe53222 (patch) | |
tree | 23c0d08acde8616b6c8722ee03c5bd2aba8d1435 | |
parent | 436eb564cc35522c893b328129f7f603637f6dca (diff) | |
download | Essentials-bd61719dcdddead43e7c5237b042bda21fe53222.tar Essentials-bd61719dcdddead43e7c5237b042bda21fe53222.tar.gz Essentials-bd61719dcdddead43e7c5237b042bda21fe53222.tar.lz Essentials-bd61719dcdddead43e7c5237b042bda21fe53222.tar.xz Essentials-bd61719dcdddead43e7c5237b042bda21fe53222.zip |
Fix login messages
-rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 4547ead88..99cf233da 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -249,15 +249,19 @@ public class EssentialsPlayerListener implements Listener user.setSleepingIgnored(true); } - if (ess.getSettings().isCustomJoinMessage()) + if ((ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentjoin")) || message == null) + { + // Do nothing - silently join + } + else if (ess.getSettings().isCustomJoinMessage()) { ess.getServer().broadcastMessage( ess.getSettings().getCustomJoinMessage() - .replace("{PLAYER}", player.getDisplayName()) - .replace("{USERNAME}", player.getName()) + .replace("{PLAYER}", player.getDisplayName()) + .replace("{USERNAME}", player.getName()) ); } - else if (!(ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("esentials.silentjoin")) && message != null) + else { ess.getServer().broadcastMessage(message); } |