From 1179caab883d59b0f389cd2ed0e581d89d86a85f Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Thu, 12 Aug 2021 04:37:19 -0700 Subject: [PATCH] Fix bot-command-relay option not ignoring itself (#4453) --- .../essentialsx/discord/listeners/DiscordCommandDispatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java index f78f13bef09..2c3205074b8 100644 --- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java +++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java @@ -19,7 +19,7 @@ public DiscordCommandDispatcher(JDADiscordService jda) { @Override public void onGuildMessageReceived(@NotNull GuildMessageReceivedEvent event) { if (jda.getConsoleWebhook() != null && event.getChannel().getId().equals(channelId)) { - if ((event.isWebhookMessage() || event.getAuthor().isBot()) && (!jda.getSettings().isConsoleBotCommandRelay() || DiscordUtil.ACTIVE_WEBHOOKS.contains(event.getAuthor().getId()))) { + if ((event.isWebhookMessage() || event.getAuthor().isBot()) && (!jda.getSettings().isConsoleBotCommandRelay() || DiscordUtil.ACTIVE_WEBHOOKS.contains(event.getAuthor().getId()) || event.getAuthor().getId().equals(event.getGuild().getSelfMember().getId()))) { return; }