Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-25 20:16:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix for total point calculation being incorrect

Browse Source
This commit is contained in:
Zrips 2023-11-17 12:55:24 +02:00
parent 24de94226f
commit 559fc9d4ab
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java
View File

@ -407,6 +407,9 @@ public class Placeholder {
return String.valueOf((int) (value * 100) / 100D);
}
DecimalFormat dFormat = new DecimalFormat("00.0");
DecimalFormat fFormat = new DecimalFormat("##.###");
public String getValue(UUID uuid, JobsPlaceHolders placeHolder, String value) {
if (placeHolder == null)
return null;
@ -452,7 +455,7 @@ public class Placeholder {
case user_totallevels:
return Integer.toString(user.getTotalLevels());
case user_points:
return new DecimalFormat("00.0").format(user.getPointsData().getCurrentPoints());
return dFormat.format(user.getPointsData().getCurrentPoints());
case user_points_fixed:
return Integer.toString((int) user.getPointsData().getCurrentPoints());
case user_total_points:
@ -520,7 +523,7 @@ public class Placeholder {
case user_jprogress_$1:
return j == null ? "" : Jobs.getCommandManager().jobProgressMessage(j.getMaxExperience(), j.getExperience());
case user_jexp_rounded_$1:
return j == null ? "0" : new DecimalFormat("##.###").format(j.getExperience());
return j == null ? "0" : fFormat.format(j.getExperience());
case user_jmaxexp_$1:
return j == null ? "0" : format.format(j.getMaxExperience());
case user_jexpunf_$1:

4
src/main/java/com/gamingmesh/jobs/container/PlayerPoints.java
View File

@ -21,12 +21,12 @@ public class PlayerPoints {
public void setPoints(double points) {
current = points;
total = points;
if (current > total)
total = current;
}
public void takePoints(double points) {
current -= points;
total -= points;
}
public boolean havePoints(double points) {