Fix for emailBlackList domain

This commit is contained in:
Xephi 2014-08-06 18:07:25 +02:00
parent 5c3f97f6c7
commit 7e9bde1d7a
2 changed files with 7 additions and 7 deletions

View File

@ -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)) {

View File

@ -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);