From 6af65e6cd40a69bd27d2a4246c6d0408bd7f95e1 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 20 May 2016 22:02:26 +0200 Subject: [PATCH] Fix wrong logic (my fault) --- .../java/fr/xephi/authme/listener/AuthMePlayerListener.java | 2 +- src/main/java/fr/xephi/authme/settings/Settings.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java index 5d700e4e..892de53d 100644 --- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java @@ -362,7 +362,7 @@ public class AuthMePlayerListener implements Listener { String nickRegEx = settings.getProperty(RestrictionSettings.ALLOWED_NICKNAME_CHARACTERS); Pattern nickPattern = Pattern.compile(nickRegEx); - if (nickPattern.matcher(player.getName()).matches() || name.equalsIgnoreCase("Player")) { + if (name.equalsIgnoreCase("Player") || !nickPattern.matcher(player.getName()).matches()) { event.setKickMessage(m.retrieveSingle(MessageKey.INVALID_NAME_CHARACTERS).replace("REG_EX", nickRegEx)); event.setResult(PlayerLoginEvent.Result.KICK_OTHER); return; diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index 0b6d719f..e66fa2e0 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -61,7 +61,7 @@ public final class Settings { getSessionTimeout = configFile.getInt("settings.sessions.timeout", 10); getMaxNickLength = configFile.getInt("settings.restrictions.maxNicknameLength", 20); getMinNickLength = configFile.getInt("settings.restrictions.minNicknameLength", 3); - getNickRegex = configFile.getString("settings.restrictions.allowedNicknameCharacters", "[a-zA-Z0-9_?]*"); + getNickRegex = load(RestrictionSettings.ALLOWED_NICKNAME_CHARACTERS); nickPattern = Pattern.compile(getNickRegex); isAllowRestrictedIp = load(RestrictionSettings.ENABLE_RESTRICTED_USERS); isRemoveSpeedEnabled = load(RestrictionSettings.REMOVE_SPEED);