Skip to content
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

Jump to bottom

Fix for null players, i.e., minions at end of phase. #390

Merged
merged 1 commit into from
May 2, 2024
Merged

Fix for null players, i.e., minions at end of phase. #390

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
7 changes: 6 additions & 1 deletion src/main/java/world/bentobox/aoneblock/listeners/CheckPhase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ protected boolean phaseRequirementsFail(@Nullable Player player, @NonNull Island
return false;
}

if (player == null) {
// Minions cannot fulfill requirements
return true;
}
return phase.getRequirements().stream()
.anyMatch(r -> checkRequirement(r, User.getInstance(player), i, is, world));
}
Expand Down Expand Up @@ -206,7 +210,8 @@ List<String> replacePlaceholders(@Nullable Player player, @NonNull String phaseN
.map(l -> ((Level) l).getIslandLevel(addon.getOverWorld(), i.getOwner())).orElse(0L);
double balance = addon.getAddonByName("Bank").map(b -> ((Bank) b).getBankManager().getBalance(i).getValue())
.orElse(0D);
double ecoBalance = addon.getPlugin().getVault()
double ecoBalance = player == null ? 0D
: addon.getPlugin().getVault()
.map(v -> v.getBalance(User.getInstance(player), addon.getOverWorld())).orElse(0D);

return c.replace("[island]", i.getName() == null ? "" : i.getName())
Expand Down
Loading