From edcf80e22758990bc5761046452458e5312ffefd Mon Sep 17 00:00:00 2001 From: HypherionMC Date: Sat, 5 Aug 2023 21:03:45 +0200 Subject: [PATCH] [BUG] Fix Whitelist Check part 2 --- .../sdlink/core/accounts/MinecraftAccount.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 0b8a357..53905c3 100644 --- a/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java +++ b/src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java @@ -317,11 +317,15 @@ public class MinecraftAccount { if (discordUser != null) { Member m = BotController.INSTANCE.getJDA().getGuilds().get(0).getMemberById(discordUser.getId()); - return m != null && m.getRoles().stream().anyMatch(r -> RoleManager.getAutoWhitelistRoles().contains(r)); + + if (m == null) + return false; + + return m.getRoles().stream().anyMatch(r -> RoleManager.getAutoWhitelistRoles().contains(r)); } } - return false; + return !SDLinkConfig.INSTANCE.whitelistingAndLinking.accountLinking.accountLinking; } /**