diff --git a/EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/listeners/LinkBukkitListener.java b/EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/listeners/LinkBukkitListener.java index 99cdb76b223..8991633a7fa 100644 --- a/EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/listeners/LinkBukkitListener.java +++ b/EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/listeners/LinkBukkitListener.java @@ -140,7 +140,13 @@ public void onDiscordMessage(final DiscordMessageEvent event) { @EventHandler public void onUserLinkStatusChange(final DiscordLinkStatusChangeEvent event) { if (event.isLinked() || ess.getSettings().getLinkPolicy() == DiscordLinkSettings.LinkPolicy.NONE) { - event.getUser().setFreeze(false); + if (event.getUser() != null) { + event.getUser().setFreeze(false); + } + return; + } + + if (event.getUser() == null || !event.getUser().getBase().isOnline()) { return; }