From 6cc0cd62f586bcc08a4280e2addf6113e2827fbc Mon Sep 17 00:00:00 2001 From: DNx5 Date: Tue, 3 Nov 2015 02:01:24 +0700 Subject: [PATCH] move set join message outside task. --- .../authme/listener/AuthMePlayerListener.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 1a7c4add..10b2b388 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -201,8 +201,16 @@ public class AuthMePlayerListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerJoin(final PlayerJoinEvent event) { - if (event.getPlayer() == null) { + if (event.getPlayer() == null) return; + + final Player player = event.getPlayer(); + String name = player.getName().toLowerCase(); + + // Remove the join message while the player isn't logging in + if (Settings.delayJoinLeaveMessages && event.getJoinMessage() != null) { + joinMessage.put(name, event.getJoinMessage()); + event.setJoinMessage(null); } // Shedule login task so works after the prelogin @@ -211,16 +219,7 @@ public class AuthMePlayerListener implements Listener { @Override public void run() { - Player player = event.getPlayer(); - String name = player.getName().toLowerCase(); - plugin.management.performJoin(player); - - // Remove the join message while the player isn't logging in - if (Settings.delayJoinLeaveMessages && event.getJoinMessage() != null) { - joinMessage.put(name, event.getJoinMessage()); - event.setJoinMessage(null); - } } }); }