From ffd11f6e0ea70a2c74c1b59438afbbb92625278b Mon Sep 17 00:00:00 2001 From: riking Date: Wed, 3 Jul 2013 22:16:32 -0700 Subject: [PATCH] Use PlayerLoginEvent instead to alleviate ban concerns Research indicates that there is still enough time from login to join for this to be a good idea. --- .../gmail/nossr50/listeners/PlayerListener.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index bbc30ea9a..8a8ef9f86 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -270,22 +270,12 @@ public class PlayerListener implements Listener { * Start user data prefetch. */ @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) - public void onFirstLogin(AsyncPlayerPreLoginEvent event) { - UserManager.prefetchUserData(event.getName()); + public void onLoginStart(PlayerLoginEvent event) { + UserManager.prefetchUserData(event.getPlayer().getName()); } /** - * Cancel user data prefetch if another plugin kicks them. - */ - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = false) - public void onPreLoginComplete(AsyncPlayerPreLoginEvent event) { - if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) { - UserManager.discardPrefetch(event.getName()); - } - } - - /** - * Cancel user data prefetch if they're banned or a plugin kicks them. + * Cancel user data prefetch if a plugin kicks them. */ @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = false) public void onLoginComplete(PlayerLoginEvent event) {