Skip to content

Fix donated points calculation using stale stored total instead of current block values #438

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

Merged
tastybento merged 2 commits into from
May 16, 2026
+12 −3
Merged

Fix donated points calculation using stale stored total instead of current block values #438

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caff259
Initial plan
Copilot May 15, 2026
5d88f5b
fix: recalculate donated points from donatedBlocks map using current …
Copilot May 16, 2026
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
15 changes: 12 additions & 3 deletions src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ private List<String> getReport() {
donatedBlocks.entrySet().stream()
.sorted(Map.Entry.<String, Integer>comparingByValue().reversed())
.forEach(entry -> {
Integer value = addon.getBlockConfig().getBlockValues().getOrDefault(entry.getKey().toLowerCase(java.util.Locale.ENGLISH), 0);
Integer value = Objects.requireNonNullElse(addon.getBlockConfig().getValue(island.getWorld(), entry.getKey().toLowerCase(java.util.Locale.ENGLISH)), 0);
long totalValue = (long) value * entry.getValue();
reportLines.add(" " + Util.prettifyText(entry.getKey()) + " x "
+ String.format("%,d", entry.getValue())
Expand Down Expand Up @@ -730,8 +730,17 @@ public void tidyUp() {
results.rawBlockCount
.addAndGet((long) (results.underWaterBlockCount.get() * addon.getSettings().getUnderWaterMultiplier()));

// Add donated block points (permanent contributions that persist across recalculations)
long donatedPoints = addon.getManager().getDonatedPoints(island);
// Add donated block points (permanent contributions that persist across recalculations).
// Recalculate from the donated blocks map using current block config values so the
// level always reflects the current configuration, even if block values changed since donation.
Map<String, Integer> donatedBlocksMap = addon.getManager().getDonatedBlocks(island);
long donatedPoints = donatedBlocksMap.entrySet().stream()
.mapToLong(entry -> {
Integer value = addon.getBlockConfig().getValue(island.getWorld(),
entry.getKey().toLowerCase(java.util.Locale.ENGLISH));
return (long) Objects.requireNonNullElse(value, 0) * entry.getValue();
})
.sum();
results.rawBlockCount.addAndGet(donatedPoints);
results.donatedPoints.set(donatedPoints);

Expand Down
Loading