Fix Whitelist Role assignment

This commit is contained in:
2023-06-22 22:25:39 +02:00
parent bedcbac0a3
commit c1ed2eaab0
2 changed files with 22 additions and 4 deletions

View File

@@ -10,6 +10,7 @@ import com.hypherionmc.sdlink.core.discord.BotController;
import com.hypherionmc.sdlink.core.managers.RoleManager; import com.hypherionmc.sdlink.core.managers.RoleManager;
import com.hypherionmc.sdlink.core.messaging.Result; import com.hypherionmc.sdlink.core.messaging.Result;
import com.hypherionmc.sdlink.core.services.SDLinkPlatform; import com.hypherionmc.sdlink.core.services.SDLinkPlatform;
import com.hypherionmc.sdlink.core.util.SystemUtils;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
@@ -144,8 +145,12 @@ public class MinecraftAccount {
try { try {
member.modifyNickname(nickname).queue(); member.modifyNickname(nickname).queue();
if (RoleManager.getLinkedRole() != null) { try {
guild.addRoleToMember(UserSnowflake.fromId(member.getId()), RoleManager.getLinkedRole()).queue(); if (RoleManager.getLinkedRole() != null) {
guild.addRoleToMember(UserSnowflake.fromId(member.getId()), RoleManager.getLinkedRole()).queue();
}
} catch (Exception e) {
e.printStackTrace();
} }
} catch (Exception e) { } catch (Exception e) {
if (SDLinkConfig.INSTANCE.generalConfig.debugging) { if (SDLinkConfig.INSTANCE.generalConfig.debugging) {
@@ -216,9 +221,18 @@ public class MinecraftAccount {
if (SDLinkConfig.INSTANCE.whitelistingAndLinking.whitelisting.linkedWhitelist) { if (SDLinkConfig.INSTANCE.whitelistingAndLinking.whitelisting.linkedWhitelist) {
this.linkAccount(member, guild); this.linkAccount(member, guild);
} }
}
return Result.success("Your account has been whitelisted"); try {
if (RoleManager.getWhitelistedRole() != null) {
guild.addRoleToMember(member, RoleManager.getWhitelistedRole()).queue();
}
} catch (Exception e) {
e.printStackTrace();
}
return Result.success("Your account has been whitelisted");
} else {
return Result.error("Account is already whitelisted on the Minecraft server");
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

View File

@@ -4,6 +4,10 @@
*/ */
package com.hypherionmc.sdlink.core.util; package com.hypherionmc.sdlink.core.util;
import com.hypherionmc.sdlink.core.managers.RoleManager;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;
import java.text.CharacterIterator; import java.text.CharacterIterator;
import java.text.StringCharacterIterator; import java.text.StringCharacterIterator;
import java.util.Arrays; import java.util.Arrays;