From 3e1c7edb2dcda486fe9d958f8aedaf28e0cfa4dd Mon Sep 17 00:00:00 2001 From: DNx5 Date: Tue, 17 Nov 2015 08:47:14 +0700 Subject: [PATCH] reorder isAuthAvailable call --- .../fr/xephi/authme/listener/AuthMePlayerListener.java | 10 ++++++---- 1 file changed, 6 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 c9cf76b0..69e1617a 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -252,18 +252,20 @@ public class AuthMePlayerListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void onPlayerLogin(PlayerLoginEvent event) { final Player player = event.getPlayer(); - if (player == null) + if (player == null) { return; - final String name = player.getName().toLowerCase(); - boolean isAuthAvailable = plugin.database.isAuthAvailable(name); + } + final String name = player.getName().toLowerCase(); if (Utils.isNPC(player) || Utils.isUnrestricted(player)) { return; } - if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) + if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) { return; + } + boolean isAuthAvailable = plugin.database.isAuthAvailable(name); if (!Settings.countriesBlacklist.isEmpty() && !isAuthAvailable && !plugin.authmePermissible(player, "authme.bypassantibot")) { String code = Utils.getCountryCode(event.getAddress().getHostAddress()); if (((code == null) || Settings.countriesBlacklist.contains(code))) {