diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java index 50869e8bf34..aa69bec9370 100644 --- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java +++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/DiscordSettings.java @@ -202,6 +202,16 @@ public boolean isShowDisplayName() { return config.getBoolean("show-displayname", false); } + protected boolean isCustomBotName() { + if (isShowName() || isShowDisplayName()) { + return true; + } + + final String format = getFormatString("mc-to-discord-name-format"); + + return format != null && !format.isEmpty() && !format.equals("{botname}"); + } + public String getAvatarURL() { return config.getString("avatar-url", "https://crafthead.net/helm/{uuid}"); } diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java index 96a8300a9a0..210a81b21f1 100644 --- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java +++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java @@ -367,7 +367,7 @@ public void updatePresence() { } public void updateTypesRelay() { - if (!getSettings().isShowAvatar() && !getSettings().isShowName() && !getSettings().isShowDisplayName()) { + if (!getSettings().isShowAvatar() && !getSettings().isCustomBotName()) { for (WrappedWebhookClient webhook : channelIdToWebhook.values()) { webhook.close(); }