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

Fix max jobs, respect negated permissions, add cumulative option #926

Browse Source
This commit is contained in:
montlikadani 2020-09-26 12:07:06 +02:00 committed by GitHub
commit d00d4a59a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/gamingmesh/jobs/PermissionManager.java
View File

@ -20,6 +20,7 @@ package com.gamingmesh.jobs;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
@ -119,7 +120,11 @@ public class PermissionManager {
return getMaxPermission(jPlayer, perm, false); return getMaxPermission(jPlayer, perm, false);
} }
public Double getMaxPermission(JobsPlayer jPlayer, String perm, boolean force) { public Double getMaxPermission(JobsPlayer jPlayer, String perm, boolean force) {
return getMaxPermission(jPlayer, perm, force, true);
}
public Double getMaxPermission(JobsPlayer jPlayer, String perm, boolean force, boolean cumulative) {
if (jPlayer == null || jPlayer.getPlayer() == null) if (jPlayer == null || jPlayer.getPlayer() == null)
return 0D; return 0D;
@ -138,23 +143,22 @@ public class PermissionManager {
return 0D; return 0D;
} }
Double amount = 0D; double amount = 0D;
for (String uno : permissions.keySet()) {
if (uno.startsWith(perm)) {
double t = 0d;
try {
t = Double.parseDouble(uno.replace(perm, ""));
} catch (NumberFormatException e) {
}
if (uno.startsWith("jobs.max")) { for (Map.Entry<String, Boolean> permission : permissions.entrySet()) {
if (amount == 0D || t > amount) { if (!permission.getKey().startsWith(perm) || !permission.getValue())
amount = t; continue;
}
} else { try {
amount += t; double temp = Double.parseDouble(permission.getKey().replace(perm, ""));
if (cumulative)
amount += temp;
else if (temp > amount)
amount = temp;
} catch (NumberFormatException ignored) {
} }
}
} }
return amount; return amount;

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

@ -554,7 +554,7 @@ public class Placeholder {
return convert(true); return convert(true);
case maxjobs: case maxjobs:
int max = Jobs.getPermissionManager().getMaxPermission(user, "jobs.max").intValue(); int max = Jobs.getPermissionManager().getMaxPermission(user, "jobs.max", false, false).intValue();
max = max == 0 ? Jobs.getGCManager().getMaxJobs() : max; max = max == 0 ? Jobs.getGCManager().getMaxJobs() : max;
return Integer.toString(max); return Integer.toString(max);

2
src/main/java/com/gamingmesh/jobs/PlayerManager.java
View File

@ -783,7 +783,7 @@ public class PlayerManager {
* @return True if he have permission * @return True if he have permission
*/ */
public boolean getJobsLimit(JobsPlayer jPlayer, short currentCount) { public boolean getJobsLimit(JobsPlayer jPlayer, short currentCount) {
int max = Jobs.getPermissionManager().getMaxPermission(jPlayer, "jobs.max").intValue(); int max = Jobs.getPermissionManager().getMaxPermission(jPlayer, "jobs.max", false, false).intValue();
max = max == 0 ? Jobs.getGCManager().getMaxJobs() : max; max = max == 0 ? Jobs.getGCManager().getMaxJobs() : max;
return max > currentCount; return max > currentCount;
} }