From 2029b5e8e5e7b398f6fd2d21615d0625a19b6822 Mon Sep 17 00:00:00 2001 From: Xephi Date: Thu, 14 Aug 2014 00:10:33 +0200 Subject: [PATCH] Fix NPE with isEmailCorrect --- src/main/java/fr/xephi/authme/settings/Settings.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index 9c2632852..60924943f 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -1011,10 +1011,10 @@ public final class Settings extends YamlConfiguration { } public static boolean isEmailCorrect(String email) { - boolean correct = true; - if (!email.contains("@")) correct = false; - if (!email.equalsIgnoreCase("your@email.com")) correct = false; + if (!email.contains("@")) return false; + if (email.equalsIgnoreCase("your@email.com")) return false; String emailDomain = email.split("@")[1]; + boolean correct = true; if (emailWhitelist != null && !emailWhitelist.isEmpty()) { for (String domain : emailWhitelist) { if (!domain.equalsIgnoreCase(emailDomain)) {