From b0a0a551a01d41f71e9ae8d82360fa072af9e4cf Mon Sep 17 00:00:00 2001 From: HypherionMC Date: Sun, 29 Oct 2023 18:48:33 +0200 Subject: [PATCH] [BUG] Fix Deny List check order --- gradle.properties | 2 +- .../sdlink/core/accounts/MinecraftAccount.java | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3a060d2..490709a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ version_major=0 version_minor=0 -version_patch=37 +version_patch=39 shade_group=com.hypherionmc.sdlink.shaded. diff --git a/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java b/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java index 7e7f3cb..798cec6 100644 --- a/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java +++ b/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java @@ -306,10 +306,7 @@ public class MinecraftAccount { } - if (!SDLinkConfig.INSTANCE.accessControl.requiredRoles.isEmpty()) { - if (RoleManager.getVerificationRoles().isEmpty()) - return Result.error("rolesNotLoaded"); - + if (!SDLinkConfig.INSTANCE.accessControl.requiredRoles.isEmpty() || ! SDLinkConfig.INSTANCE.accessControl.deniedRoles.isEmpty()) { Profiler profiler = Profiler.getProfiler("checkRequiredRoles"); profiler.start("Checking Required Roles"); AtomicBoolean anyFound = new AtomicBoolean(false); @@ -330,10 +327,10 @@ public class MinecraftAccount { })); profiler.stop(); - if (deniedFound.get()) + if (deniedFound.get() && !RoleManager.getDeniedRoles().isEmpty()) return Result.error("accessDeniedByRole"); - if (!anyFound.get()) + if (!anyFound.get() && !RoleManager.getVerificationRoles().isEmpty()) return Result.error("rolesNotFound"); if (member.isEmpty())