From e88b4eda53ba61b7f4b1dd422598687e42d485a6 Mon Sep 17 00:00:00 2001 From: Xephi59 Date: Sun, 28 Feb 2016 00:36:06 +0100 Subject: [PATCH] Add %acc_nb tag to max_reg message - Fix #570 --- .../java/fr/xephi/authme/output/MessageKey.java | 2 +- .../authme/process/register/AsyncRegister.java | 15 +++++++++------ src/main/resources/messages/messages_en.yml | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/fr/xephi/authme/output/MessageKey.java b/src/main/java/fr/xephi/authme/output/MessageKey.java index 45cdc0bef..0c96b6667 100644 --- a/src/main/java/fr/xephi/authme/output/MessageKey.java +++ b/src/main/java/fr/xephi/authme/output/MessageKey.java @@ -41,7 +41,7 @@ public enum MessageKey { REGISTER_EMAIL_MESSAGE("reg_email_msg"), - MAX_REGISTER_EXCEEDED("max_reg"), + MAX_REGISTER_EXCEEDED("max_reg", "%acc_nb"), USAGE_REGISTER("usage_reg"), diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java index e17c511da..97344ba04 100644 --- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java @@ -1,5 +1,8 @@ package fr.xephi.authme.process.register; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; + import fr.xephi.authme.AuthMe; import fr.xephi.authme.cache.auth.PlayerAuth; import fr.xephi.authme.cache.auth.PlayerCache; @@ -13,8 +16,6 @@ import fr.xephi.authme.security.crypts.TwoFactor; import fr.xephi.authme.settings.NewSetting; import fr.xephi.authme.settings.Settings; import fr.xephi.authme.util.StringUtils; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; /** */ @@ -71,6 +72,7 @@ public class AsyncRegister { } //check this in both possiblities so don't use 'else if' + Integer size = 0; if (database.isAuthAvailable(name)) { m.send(player, MessageKey.NAME_ALREADY_REGISTERED); return false; @@ -78,8 +80,8 @@ public class AsyncRegister { && !plugin.getPermissionsManager().hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS) && !ip.equalsIgnoreCase("127.0.0.1") && !ip.equalsIgnoreCase("localhost") - && database.getAllAuthsByIp(ip).size() >= Settings.getmaxRegPerIp) { - m.send(player, MessageKey.MAX_REGISTER_EXCEEDED); + && (size = database.getAllAuthsByIp(ip).size()) >= Settings.getmaxRegPerIp) { + m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, size.toString()); return false; } return true; @@ -96,10 +98,11 @@ public class AsyncRegister { } private void emailRegister() { + Integer size = 0; if (Settings.getmaxRegPerEmail > 0 && !plugin.getPermissionsManager().hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS) - && database.countAuthsByEmail(email) >= Settings.getmaxRegPerEmail) { - m.send(player, MessageKey.MAX_REGISTER_EXCEEDED); + && (size = database.countAuthsByEmail(email)) >= Settings.getmaxRegPerEmail) { + m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, size.toString()); return; } final HashedPassword hashedPassword = plugin.getPasswordSecurity().computeHash(password, name); diff --git a/src/main/resources/messages/messages_en.yml b/src/main/resources/messages/messages_en.yml index 1b1ae61e4..4e155bcfe 100644 --- a/src/main/resources/messages/messages_en.yml +++ b/src/main/resources/messages/messages_en.yml @@ -12,7 +12,7 @@ login: '&2Successful login!' vb_nonActiv: '&cYour account isn''t activated yet, please check your emails!' user_regged: '&cYou already have registered this username!' usage_reg: '&cUsage: /register ' -max_reg: '&cYou have exceeded the maximum number of registrations for your connection!' +max_reg: '&cYou have exceeded the maximum number of registrations (%acc_nb) for your connection!' no_perm: '&4You don''t have the permission to perform this action!' error: '&4An unexpected error occurred, please contact an administrator!' login_msg: '&cPlease, login with the command "/login "'