diff --git a/src/main/java/fr/xephi/authme/output/MessageKey.java b/src/main/java/fr/xephi/authme/output/MessageKey.java index c996fe4e4..fe006686a 100644 --- a/src/main/java/fr/xephi/authme/output/MessageKey.java +++ b/src/main/java/fr/xephi/authme/output/MessageKey.java @@ -97,6 +97,8 @@ public enum MessageKey { USAGE_ADD_EMAIL("usage_email_add"), + USAGE_CHANGE_EMAIL("usage_email_change"), + USAGE_RECOVER_EMAIL("usage_email_recovery"), INVALID_NEW_EMAIL("new_email_invalid"), diff --git a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java index 039ab69a9..e59aaab89 100644 --- a/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java +++ b/src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java @@ -5,7 +5,6 @@ import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.output.Messages; -import fr.xephi.authme.permission.PlayerPermission; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.util.StringUtils; import org.bukkit.entity.Player; @@ -52,6 +51,11 @@ public class AsyncChangeEmail { m.send(player, MessageKey.INVALID_OLD_EMAIL); return; } + } else { + if (!StringUtils.isEmpty(currentEmail) && !currentEmail.equals("your@email.com")) { + m.send(player, MessageKey.USAGE_CHANGE_EMAIL); + return; + } } if (!Settings.isEmailCorrect(newEmail)) { m.send(player, MessageKey.INVALID_NEW_EMAIL);