From e1d1ebfca55bb4b8c02d86cff07c4cf6f7885dbf Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sun, 8 Nov 2015 14:18:51 +0100 Subject: [PATCH] Move to old getPlayer method that always work and let us be more compatible --- .../fr/xephi/authme/listener/AuthMePlayerListener.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 64555bcf..fda2caa7 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -227,15 +227,14 @@ public class AuthMePlayerListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void onPreLogin(AsyncPlayerPreLoginEvent event) { final String name = event.getName().toLowerCase(); - final Player player = plugin.dataManager.getOnlinePlayerLower(name); + final Player player = plugin.getServer().getPlayer(name); if (player == null) return; // Check if forceSingleSession is set to true, so kick player that has // joined with same nick of online player - if (Settings.isForceSingleSessionEnabled) { - event.setKickMessage(m.getString("same_nick")); - event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER); + if (Settings.isForceSingleSessionEnabled && player.isOnline()) { + event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, m.getString("same_nick")); if (LimboCache.getInstance().hasLimboPlayer(name)) Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {