Skip to content

fix: NPE importing GriefPrevention data with Bedrock (Geyser/Floodgate) players #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noaskers wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: NPE importing GriefPrevention data with Bedrock (Geyser/Floodgate) players #503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions bukkit/src/main/java/net/william278/huskclaims/hook/BukkitGriefPreventionImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,12 +417,10 @@ private GriefPreventionUser(@NotNull UUID uuid, @NotNull Timestamp lastLogin, in
this.claimBlocks = claimBlocks;
this.spentClaimBlocks = spentClaimBlocks;

// Note the server may not have a cached name for a player, even if they have played before
final OfflinePlayer player = plugin.getServer().getOfflinePlayer(uuid);
if (player.hasPlayedBefore()) {
this.name = player.getName();
} else {
this.name = uuid.toString().substring(0, 8);
}
final String playerName = player.hasPlayedBefore() ? player.getName() : null;
this.name = playerName != null ? playerName : uuid.toString().substring(0, 8);
}

@NotNull
Expand Down