From a67a4bb72b955ddda337a8dd0fa2a71143e1bad4 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sun, 17 Jul 2022 18:40:11 +0200 Subject: [PATCH] Don't let unrestricted usernames bypass the locked ip-username check --- .../fr/xephi/authme/process/join/AsynchronousJoin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java index cacfdbd6..0e49eeee 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java @@ -93,6 +93,11 @@ public class AsynchronousJoin implements AsynchronousProcess { final String name = player.getName().toLowerCase(); final String ip = PlayerUtils.getPlayerIp(player); + if (!validationService.fulfillsNameRestrictions(player)) { + handlePlayerWithUnmetNameRestriction(player, ip); + return; + } + if (service.getProperty(RestrictionSettings.UNRESTRICTED_NAMES).contains(name)) { return; } @@ -107,11 +112,6 @@ public class AsynchronousJoin implements AsynchronousProcess { pluginHookService.setEssentialsSocialSpyStatus(player, false); } - if (!validationService.fulfillsNameRestrictions(player)) { - handlePlayerWithUnmetNameRestriction(player, ip); - return; - } - if (!validatePlayerCountForIp(player, ip)) { return; }