From 044e3e38455d042b6067074843b62b6ad35f6abd Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 6 Jan 2017 12:00:05 +0100 Subject: [PATCH] Don't use the customJoinMessage if removeJoinMessage is enabled --- .../java/fr/xephi/authme/listener/PlayerListener.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index 5edac332..fef21d89 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -166,7 +166,9 @@ public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void onJoinMessage(PlayerJoinEvent event) { final Player player = event.getPlayer(); - if (player == null) { + + if (settings.getProperty(RegistrationSettings.REMOVE_JOIN_MESSAGE)) { + event.setJoinMessage(null); return; } @@ -175,10 +177,7 @@ public class PlayerListener implements Listener { event.setJoinMessage(customJoinMessage.replace("{PLAYERNAME}", player.getName()) .replace("{DISPLAYNAME]", player.getDisplayName())); } - if (settings.getProperty(RegistrationSettings.REMOVE_JOIN_MESSAGE)) { - event.setJoinMessage(null); - return; - } + if (!settings.getProperty(RegistrationSettings.DELAY_JOIN_MESSAGE)) { return; }