Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-30 21:07:48 +01:00
Code Issues Projects Releases Wiki Activity

Lets properly force permission update on bonus command request

Browse Source
This commit is contained in:
Zrips 2023-11-17 12:48:32 +02:00
parent 527bd03f2f
commit 24de94226f
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java
View File

@ -344,7 +344,7 @@ public class JobsPlayer {
* *
* @param jobName * @param jobName
* @param type {@link CurrencyType} * @param type {@link CurrencyType}
* @param force whenever to retrieve as soon as possible without time * @param force whenever we should update now or wait until scheduled time
* @return amount of boost * @return amount of boost
*/ */
public double getBoost(String jobName, CurrencyType type, boolean force) { public double getBoost(String jobName, CurrencyType type, boolean force) {
@ -354,7 +354,6 @@ public class JobsPlayer {
return boost; return boost;
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
List<BoostCounter> counterList = boostCounter.get(jobName); List<BoostCounter> counterList = boostCounter.get(jobName);
if (counterList != null) { if (counterList != null) {
for (BoostCounter counter : counterList) { for (BoostCounter counter : counterList) {
@ -362,7 +361,7 @@ public class JobsPlayer {
continue; continue;
if (force || time - counter.getTime() > 1000 * 60) { if (force || time - counter.getTime() > 1000 * 60) {
boost = getPlayerBoostNew(jobName, type); boost = getPlayerBoostNew(jobName, type, force);
counter.setBoost(boost); counter.setBoost(boost);
counter.setTime(time); counter.setTime(time);
return boost; return boost;
@ -371,12 +370,12 @@ public class JobsPlayer {
return counter.getBoost(); return counter.getBoost();
} }
boost = getPlayerBoostNew(jobName, type); boost = getPlayerBoostNew(jobName, type, force);
counterList.add(new BoostCounter(type, boost, time)); counterList.add(new BoostCounter(type, boost, time));
return boost; return boost;
} }
boost = getPlayerBoostNew(jobName, type); boost = getPlayerBoostNew(jobName, type, force);
counterList = new ArrayList<>(); counterList = new ArrayList<>();
counterList.add(new BoostCounter(type, boost, time)); counterList.add(new BoostCounter(type, boost, time));
@ -385,38 +384,38 @@ public class JobsPlayer {
return boost; return boost;
} }
private Double getPlayerBoostNew(String jobName, CurrencyType type) { private Double getPlayerBoostNew(String jobName, CurrencyType type, Boolean forced) {
if (Jobs.getGCManager().addPermissionBoost) { if (Jobs.getGCManager().addPermissionBoost) {
Double boost = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + jobName + "." + type.getName(), true, true); Double boost = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + jobName + "." + type.getName(), forced != null ? forced : true, true);
Double v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + jobName + ".all", false, true); Double v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + jobName + ".all", forced != null ? forced : false, true);
if (v1 != 0d) if (v1 != 0d)
boost += v1; boost += v1;
v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all.all", false, true); v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all.all", forced != null ? forced : false, true);
if (v1 != 0d) if (v1 != 0d)
boost += v1; boost += v1;
v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all." + type.getName(), false, true); v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all." + type.getName(), forced != null ? forced : false, true);
if (v1 != 0d) if (v1 != 0d)
boost += v1; boost += v1;
return boost; return boost;
} }
Double boost = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + jobName + "." + type.getName(), true, false); Double boost = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + jobName + "." + type.getName(), forced != null ? forced : true, false);
Double v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + jobName + ".all", false, false); Double v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost." + jobName + ".all", forced != null ? forced : false, false);
if (v1 != 0d && (v1 > boost || v1 < boost && !Jobs.getGCManager().highestPermissionBoost)) if (v1 != 0d && (v1 > boost || v1 < boost && !Jobs.getGCManager().highestPermissionBoost))
boost = v1; boost = v1;
v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all.all", false, false); v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all.all", forced != null ? forced : false, false);
if (v1 != 0d && (v1 > boost || v1 < boost && !Jobs.getGCManager().highestPermissionBoost)) if (v1 != 0d && (v1 > boost || v1 < boost && !Jobs.getGCManager().highestPermissionBoost))
boost = v1; boost = v1;
v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all." + type.getName(), false, false); v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all." + type.getName(), forced != null ? forced : false, false);
if (v1 != 0d && (v1 > boost || v1 < boost && !Jobs.getGCManager().highestPermissionBoost)) if (v1 != 0d && (v1 > boost || v1 < boost && !Jobs.getGCManager().highestPermissionBoost))
boost = v1; boost = v1;