From 9e57dd6aef2606b76bd194ab11ac587d70ab80db Mon Sep 17 00:00:00 2001
From: JRoy <10731363+JRoy@users.noreply.github.com>
Date: Sat, 29 Jun 2024 14:38:36 -0400
Subject: [PATCH] Fix NPE when using avatars in discord module (Fixes #5748)

---
 .../main/java/net/essentialsx/discord/JDADiscordService.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
index ebc023d8b9d..2843e55af2b 100644
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
@@ -383,11 +383,10 @@ public void updateTypesRelay() {
 
             final Webhook webhook = DiscordUtil.getOrCreateWebhook(channel, DiscordUtil.ADVANCED_RELAY_NAME).join();
             if (webhook == null) {
-                final WrappedWebhookClient current = channelIdToWebhook.get(channel.getId());
+                final WrappedWebhookClient current = channelIdToWebhook.remove(channel.getId());
                 if (current != null) {
                     current.close();
                 }
-                channelIdToWebhook.remove(channel.getId()).close();
                 continue;
             }
             typeToChannelId.put(type, channel.getId());