From 7e9bde1d7a8d380bab4f0f84016a9670b2cbd9f5 Mon Sep 17 00:00:00 2001 From: Xephi Date: Wed, 6 Aug 2014 18:07:25 +0200 Subject: [PATCH] Fix for emailBlackList domain --- .../java/fr/xephi/authme/commands/EmailCommand.java | 12 ++++++------ .../fr/xephi/authme/commands/RegisterCommand.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/fr/xephi/authme/commands/EmailCommand.java b/src/main/java/fr/xephi/authme/commands/EmailCommand.java index da1a0bc8..cd2e9a81 100644 --- a/src/main/java/fr/xephi/authme/commands/EmailCommand.java +++ b/src/main/java/fr/xephi/authme/commands/EmailCommand.java @@ -71,9 +71,9 @@ public class EmailCommand implements CommandExecutor { m._(player, "usage_email_change"); return true; } - if (!args[1].contains("@")) { - m._(player, "email_invalid"); - return true; + if(!Settings.isEmailCorrect(args[1])) { + m._(player, "email_invalid"); + return true; } auth.setEmail(args[1]); if (!data.updateEmail(auth)) { @@ -113,9 +113,9 @@ public class EmailCommand implements CommandExecutor { m._(player, "old_email_invalid"); return true; } - if (!args[2].contains("@")) { - m._(player, "new_email_invalid"); - return true; + if(!Settings.isEmailCorrect(args[2])) { + m._(player, "new_email_invalid"); + return true; } auth.setEmail(args[2]); if (!data.updateEmail(auth)) { diff --git a/src/main/java/fr/xephi/authme/commands/RegisterCommand.java b/src/main/java/fr/xephi/authme/commands/RegisterCommand.java index 6bd2b5cf..033abb90 100644 --- a/src/main/java/fr/xephi/authme/commands/RegisterCommand.java +++ b/src/main/java/fr/xephi/authme/commands/RegisterCommand.java @@ -49,7 +49,7 @@ public class RegisterCommand implements CommandExecutor { } final String email = args[0]; if(!Settings.isEmailCorrect(email)) { - m._(player, "usage_reg"); + m._(player, "email_invalid"); return true; } RandomString rand = new RandomString(Settings.getRecoveryPassLength);