firstdarkdev/sdlink-core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FEAT] Check if linked account is still a discord member in whitelisting check

Browse Source
This commit is contained in:
HypherionSA
2023-08-05 18:57:11 +02:00
parent 0ffbc0f48e
commit 3bffb7cdc5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/hypherionmc/sdlink/core/accounts/MinecraftAccount.java
View File

@@ -299,12 +299,13 @@ public class MinecraftAccount {
if (account == null) if (account == null)
return false; return false;
if (SDLinkConfig.INSTANCE.whitelistingAndLinking.accountLinking.accountLinking) {
User discordUser = getDiscordUser(); User discordUser = getDiscordUser();
if (discordUser != null) { if (discordUser != null) {
Member m = BotController.INSTANCE.getJDA().getGuilds().get(0).getMemberById(discordUser.getId()); Member m = BotController.INSTANCE.getJDA().getGuilds().get(0).getMemberById(discordUser.getId());
if (m != null) return m != null && m.getRoles().stream().anyMatch(r -> RoleManager.getAutoWhitelistRoles().contains(r));
return m.getRoles().stream().anyMatch(r -> RoleManager.getAutoWhitelistRoles().contains(r)); }
} }
return !SDLinkPlatform.minecraftHelper.isPlayerWhitelisted(MinecraftAccount.standard(account.getUsername())).isError() && account.isWhitelisted(); return !SDLinkPlatform.minecraftHelper.isPlayerWhitelisted(MinecraftAccount.standard(account.getUsername())).isError() && account.isWhitelisted();