Skip to content

Commit 0cb387f

Browse files
authored
Fix NPE when unlinking offline players (#6111)
Fixes #6105
1 parent dabe687 commit 0cb387f

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

EssentialsDiscordLink/src/main/java/net/essentialsx/discordlink/listeners/LinkBukkitListener.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,13 @@ public void onDiscordMessage(final DiscordMessageEvent event) {
140140
@EventHandler
141141
public void onUserLinkStatusChange(final DiscordLinkStatusChangeEvent event) {
142142
if (event.isLinked() || ess.getSettings().getLinkPolicy() == DiscordLinkSettings.LinkPolicy.NONE) {
143-
event.getUser().setFreeze(false);
143+
if (event.getUser() != null) {
144+
event.getUser().setFreeze(false);
145+
}
146+
return;
147+
}
148+
149+
if (event.getUser() == null || !event.getUser().getBase().isOnline()) {
144150
return;
145151
}
146152

0 commit comments

Comments
 (0)