Don't let unrestricted usernames bypass the locked ip-username check

AuthMe · Jul 17, 2022 · a67a4bb · a67a4bb
1 parent 64c45c4
commit a67a4bb
Showing 1 changed file with 5 additions and 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
@@ -93,6 +93,11 @@ public void processJoin(final Player player) {
         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 void processJoin(final Player player) {
             pluginHookService.setEssentialsSocialSpyStatus(player, false);
         }
 
-        if (!validationService.fulfillsNameRestrictions(player)) {
-            handlePlayerWithUnmetNameRestriction(player, ip);
-            return;
-        }
-
         if (!validatePlayerCountForIp(player, ip)) {
             return;
         }