diff --git a/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java b/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java index badc2e1a..3a7f9a50 100644 --- a/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java +++ b/src/main/java/fr/xephi/authme/listener/OnJoinVerifier.java @@ -101,7 +101,7 @@ public class OnJoinVerifier implements Reloadable { * @throws FailedVerificationException if the email verification is not completed */ public void checkKickNotVerified(boolean isAuthAvailable) throws FailedVerificationException { - if (!isAuthAvailable && settings.getProperty(RestrictionSettings.KICK_NON_REGISTERED) && settings.getProperty(RestrictionSettings.KICK_NOT_VERIFIED)) { + if (!isAuthAvailable && settings.getProperty(RestrictionSettings.KICK_NOT_VERIFIED)) { throw new FailedVerificationException(MessageKey.MUST_VERIFIED_MESSAGE); } } diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index 93b8f4f8..a7833a2e 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -150,7 +150,7 @@ public class PlayerListener implements Listener { // Slow, blocking checks try { final PlayerAuth auth = dataSource.getAuth(name); - final boolean isAuthAvailable = auth != null && auth.isEmailVerified(); + final boolean isAuthAvailable = (auth != null && auth.isEmailVerified()); onJoinVerifier.checkKickNonRegistered(isAuthAvailable); onJoinVerifier.checkKickNotVerified(isAuthAvailable); onJoinVerifier.checkAntibot(name, isAuthAvailable);