fix: cap donated block counts to current block limits in level calculation

[Copilot]

When a block's donation limit is lowered after players have already donated above the new threshold, the excess blocks continue counting toward island level. The donated count was never validated against the current limit at calculation time.

Changes

• IslandLevelCalculator.tidyUp(): When computing donated points, look up the current block limit for each donated block type and apply Math.min(donatedCount, limit) before multiplying by value. This mirrors the existing limitCountAndValue() enforcement applied to on-island blocks during chunk scanning.

// Before — no limit applied to donated countreturn (long) Objects.requireNonNullElse(value, 0) * entry.getValue();
// After — donated count capped to current limitintcount = entry.getValue();
Integerlimit = addon.getBlockConfig().getLimit(key);
if (limit != null) {
count = Math.min(count, limit);
}
return (long) Objects.requireNonNullElse(value, 0) * count;

• IslandLevelCalculatorTidyUpTest: Three new tests covering donated-under-limit (full count used), donated-over-limit (capped to current limit), and no limit configured (full count used).

Note: This change is retrospective — existing servers where limits were previously uncapped will see a level reduction on next recalculation for affected islands.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[Copilot]

When a block's donation limit is lowered after players have already donated above the new threshold, the excess blocks continue counting toward island level. The donated count was never validated against the current limit at calculation time.

Changes

• IslandLevelCalculator.tidyUp(): When computing donated points, look up the current block limit for each donated block type and apply Math.min(donatedCount, limit) before multiplying by value. This mirrors the existing limitCountAndValue() enforcement applied to on-island blocks during chunk scanning.

// Before — no limit applied to donated countreturn (long) Objects.requireNonNullElse(value, 0) * entry.getValue();
// After — donated count capped to current limitintcount = entry.getValue();
Integerlimit = addon.getBlockConfig().getLimit(key);
if (limit != null) {
count = Math.min(count, limit);
}
return (long) Objects.requireNonNullElse(value, 0) * count;

• IslandLevelCalculatorTidyUpTest: Three new tests covering donated-under-limit (full count used), donated-over-limit (capped to current limit), and no limit configured (full count used).

Note: This change is retrospective — existing servers where limits were previously uncapped will see a level reduction on next recalculation for affected islands.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[Copilot]

When a block's donation limit is lowered after players have already donated above the new threshold, the excess blocks continue counting toward island level. The donated count was never validated against the current limit at calculation time.

Changes

• IslandLevelCalculator.tidyUp(): When computing donated points, look up the current block limit for each donated block type and apply Math.min(donatedCount, limit) before multiplying by value. This mirrors the existing limitCountAndValue() enforcement applied to on-island blocks during chunk scanning.

// Before — no limit applied to donated countreturn (long) Objects.requireNonNullElse(value, 0) * entry.getValue();
// After — donated count capped to current limitintcount = entry.getValue();
Integerlimit = addon.getBlockConfig().getLimit(key);
if (limit != null) {
count = Math.min(count, limit);
}
return (long) Objects.requireNonNullElse(value, 0) * count;

• IslandLevelCalculatorTidyUpTest: Three new tests covering donated-under-limit (full count used), donated-over-limit (capped to current limit), and no limit configured (full count used).

Note: This change is retrospective — existing servers where limits were previously uncapped will see a level reduction on next recalculation for affected islands.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[Copilot]

When a block's donation limit is lowered after players have already donated above the new threshold, the excess blocks continue counting toward island level. The donated count was never validated against the current limit at calculation time.

Changes

• IslandLevelCalculator.tidyUp(): When computing donated points, look up the current block limit for each donated block type and apply Math.min(donatedCount, limit) before multiplying by value. This mirrors the existing limitCountAndValue() enforcement applied to on-island blocks during chunk scanning.

// Before — no limit applied to donated countreturn (long) Objects.requireNonNullElse(value, 0) * entry.getValue();
// After — donated count capped to current limitintcount = entry.getValue();
Integerlimit = addon.getBlockConfig().getLimit(key);
if (limit != null) {
count = Math.min(count, limit);
}
return (long) Objects.requireNonNullElse(value, 0) * count;

• IslandLevelCalculatorTidyUpTest: Three new tests covering donated-under-limit (full count used), donated-over-limit (capped to current limit), and no limit configured (full count used).

Note: This change is retrospective — existing servers where limits were previously uncapped will see a level reduction on next recalculation for affected islands.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[Copilot]

When a block's donation limit is lowered after players have already donated above the new threshold, the excess blocks continue counting toward island level. The donated count was never validated against the current limit at calculation time.

Changes

• IslandLevelCalculator.tidyUp(): When computing donated points, look up the current block limit for each donated block type and apply Math.min(donatedCount, limit) before multiplying by value. This mirrors the existing limitCountAndValue() enforcement applied to on-island blocks during chunk scanning.

// Before — no limit applied to donated countreturn (long) Objects.requireNonNullElse(value, 0) * entry.getValue();
// After — donated count capped to current limitintcount = entry.getValue();
Integerlimit = addon.getBlockConfig().getLimit(key);
if (limit != null) {
count = Math.min(count, limit);
}
return (long) Objects.requireNonNullElse(value, 0) * count;

• IslandLevelCalculatorTidyUpTest: Three new tests covering donated-under-limit (full count used), donated-over-limit (capped to current limit), and no limit configured (full count used).

Note: This change is retrospective — existing servers where limits were previously uncapped will see a level reduction on next recalculation for affected islands.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[Copilot]

When a block's donation limit is lowered after players have already donated above the new threshold, the excess blocks continue counting toward island level. The donated count was never validated against the current limit at calculation time.

Changes

• IslandLevelCalculator.tidyUp(): When computing donated points, look up the current block limit for each donated block type and apply Math.min(donatedCount, limit) before multiplying by value. This mirrors the existing limitCountAndValue() enforcement applied to on-island blocks during chunk scanning.

// Before — no limit applied to donated countreturn (long) Objects.requireNonNullElse(value, 0) * entry.getValue();
// After — donated count capped to current limitintcount = entry.getValue();
Integerlimit = addon.getBlockConfig().getLimit(key);
if (limit != null) {
count = Math.min(count, limit);
}
return (long) Objects.requireNonNullElse(value, 0) * count;

• IslandLevelCalculatorTidyUpTest: Three new tests covering donated-under-limit (full count used), donated-over-limit (capped to current limit), and no limit configured (full count used).

Note: This change is retrospective — existing servers where limits were previously uncapped will see a level reduction on next recalculation for affected islands.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[Copilot]

When a block's donation limit is lowered after players have already donated above the new threshold, the excess blocks continue counting toward island level. The donated count was never validated against the current limit at calculation time.

Changes

• IslandLevelCalculator.tidyUp(): When computing donated points, look up the current block limit for each donated block type and apply Math.min(donatedCount, limit) before multiplying by value. This mirrors the existing limitCountAndValue() enforcement applied to on-island blocks during chunk scanning.

// Before — no limit applied to donated countreturn (long) Objects.requireNonNullElse(value, 0) * entry.getValue();
// After — donated count capped to current limitintcount = entry.getValue();
Integerlimit = addon.getBlockConfig().getLimit(key);
if (limit != null) {
count = Math.min(count, limit);
}
return (long) Objects.requireNonNullElse(value, 0) * count;

• IslandLevelCalculatorTidyUpTest: Three new tests covering donated-under-limit (full count used), donated-over-limit (capped to current limit), and no limit configured (full count used).

Note: This change is retrospective — existing servers where limits were previously uncapped will see a level reduction on next recalculation for affected islands.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[Copilot]

When a block's donation limit is lowered after players have already donated above the new threshold, the excess blocks continue counting toward island level. The donated count was never validated against the current limit at calculation time.

Changes

• IslandLevelCalculator.tidyUp(): When computing donated points, look up the current block limit for each donated block type and apply Math.min(donatedCount, limit) before multiplying by value. This mirrors the existing limitCountAndValue() enforcement applied to on-island blocks during chunk scanning.

// Before — no limit applied to donated countreturn (long) Objects.requireNonNullElse(value, 0) * entry.getValue();
// After — donated count capped to current limitintcount = entry.getValue();
Integerlimit = addon.getBlockConfig().getLimit(key);
if (limit != null) {
count = Math.min(count, limit);
}
return (long) Objects.requireNonNullElse(value, 0) * count;

• IslandLevelCalculatorTidyUpTest: Three new tests covering donated-under-limit (full count used), donated-over-limit (capped to current limit), and no limit configured (full count used).

Note: This change is retrospective — existing servers where limits were previously uncapped will see a level reduction on next recalculation for affected islands.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud