From d4e3b9504a227b529348a58e3a82e504bc153b55 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Fri, 17 Sep 2021 20:05:57 +0200 Subject: [PATCH] Notify user when they aren't linked and try to unlink --- .../alttd/proxydiscordlink/bot/commands/DiscordUnlink.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordUnlink.java b/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordUnlink.java index 012ff35..048f60c 100644 --- a/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordUnlink.java +++ b/src/main/java/com/alttd/proxydiscordlink/bot/commands/DiscordUnlink.java @@ -38,6 +38,10 @@ public class DiscordUnlink extends DiscordCommand { Database database = DiscordLink.getPlugin().getDatabase(); DiscordLinkPlayer discordLinkPlayer = DiscordLinkPlayer.getDiscordLinkPlayer(member.getIdLong()); + if (discordLinkPlayer == null) { + message.getChannel().sendMessage("Your accounts aren't linked.").queue(); + return; + } database.removeLinkedAccount(discordLinkPlayer.getUuid()); discordLinkPlayer.updateDiscord( @@ -51,7 +55,6 @@ public class DiscordUnlink extends DiscordCommand { .collect(Collectors.toList()), false); discordLinkPlayer.linkedRole(false); - message.getChannel().sendMessage("Your Discord and Minecraft accounts have been unlinked.") - .queue(m -> m.delete().queueAfter(15, TimeUnit.SECONDS)); + message.getChannel().sendMessage("Your Discord and Minecraft accounts have been unlinked.").queue(); } }