Fix #570 add max_acc and reg_acc placeholders
This commit is contained in:
@@ -73,6 +73,7 @@ public class AsyncRegister {
|
||||
|
||||
//check this in both possiblities so don't use 'else if'
|
||||
Integer size = 0;
|
||||
Integer maxReg = Settings.getmaxRegPerIp;
|
||||
if (database.isAuthAvailable(name)) {
|
||||
m.send(player, MessageKey.NAME_ALREADY_REGISTERED);
|
||||
return false;
|
||||
@@ -80,8 +81,8 @@ public class AsyncRegister {
|
||||
&& !plugin.getPermissionsManager().hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS)
|
||||
&& !ip.equalsIgnoreCase("127.0.0.1")
|
||||
&& !ip.equalsIgnoreCase("localhost")
|
||||
&& (size = database.getAllAuthsByIp(ip).size()) >= Settings.getmaxRegPerIp) {
|
||||
m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, size.toString());
|
||||
&& (size = database.getAllAuthsByIp(ip).size()) >= maxReg) {
|
||||
m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, maxReg.toString(), size.toString());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -98,11 +99,12 @@ public class AsyncRegister {
|
||||
}
|
||||
|
||||
private void emailRegister() {
|
||||
Integer maxReg = Settings.getmaxRegPerIp;
|
||||
Integer size = 0;
|
||||
if (Settings.getmaxRegPerEmail > 0
|
||||
&& !plugin.getPermissionsManager().hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS)
|
||||
&& (size = database.countAuthsByEmail(email)) >= Settings.getmaxRegPerEmail) {
|
||||
m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, size.toString());
|
||||
&& (size = database.getAllAuthsByIp(ip).size()) >= maxReg) {
|
||||
m.send(player, MessageKey.MAX_REGISTER_EXCEEDED, maxReg.toString(), size.toString());
|
||||
return;
|
||||
}
|
||||
final HashedPassword hashedPassword = plugin.getPasswordSecurity().computeHash(password, name);
|
||||
|
||||
Reference in New Issue
Block a user