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
commitd40e331c8a97491b810ccbb9dfd5b14be96066ac (patch)
tree87861ace25905ac133b340c7e7770edac43a19bd
parentc57e902173ba890d16d97233465ab9b1c4b23f1f (diff)
downloadEssentials-d40e331c8a97491b810ccbb9dfd5b14be96066ac.tar
Essentials-d40e331c8a97491b810ccbb9dfd5b14be96066ac.tar.gz
Essentials-d40e331c8a97491b810ccbb9dfd5b14be96066ac.tar.lz
Essentials-d40e331c8a97491b810ccbb9dfd5b14be96066ac.tar.xz
Essentials-d40e331c8a97491b810ccbb9dfd5b14be96066ac.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"))
{