Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-07 03:00:29 +01:00
Code Issues Projects Releases Wiki Activity

Added island score block limits.

Browse Source
This commit is contained in:
WolfDW 2020-06-25 02:44:08 +00:00
parent 46495540c1
commit 4bac2282c8
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/songoda/skyblock/island/IslandLevel.java
View File

@ -78,8 +78,15 @@ public class IslandLevel {
if (current == null) continue; if (current == null) continue;
long pointsRequired = current.getLong("Points", 0); long pointsRequired = current.getLong("Points", 0);
long blockAmount = entry.getValue();
if (pointsRequired != 0) pointsEarned = pointsEarned + (entry.getValue() * pointsRequired); long materialLimit = current.getLong("Limit", -1);
long materialAmountCounted = Math.min(materialLimit, blockAmount);
if (materialLimit == -1)
materialAmountCounted = blockAmount;
if (pointsRequired != 0) pointsEarned = pointsEarned + (materialAmountCounted * pointsRequired);
} }
@ -99,12 +106,17 @@ public class IslandLevel {
if (current == null) return 0; if (current == null) return 0;
Long boxedAmount = this.materials.get(material); Long boxedAmount = this.materials.get(material);
if (boxedAmount == null) return 0; if (boxedAmount == null) return 0;
long materialLimit = current.getLong("Limit", -1);
long materialAmountCounted = Math.min(materialLimit, boxedAmount);
if (materialLimit == -1)
materialAmountCounted = boxedAmount;
long pointsRequired = current.getLong("Points"); long pointsRequired = current.getLong("Points");
return pointsRequired == 0 ? 0 : boxedAmount * pointsRequired; return pointsRequired == 0 ? 0 : materialAmountCounted * pointsRequired;
} }
public long getLevel() { public long getLevel() {