From 497673f2dcf6a73f48a5f882a27a1445384f8995 Mon Sep 17 00:00:00 2001 From: Zrips Date: Mon, 28 Sep 2020 12:45:37 +0300 Subject: [PATCH] Cumulative needs to be false by default. --- .../gamingmesh/jobs/PermissionManager.java | 26 +++++++++---------- .../gamingmesh/jobs/commands/list/join.java | 7 +++-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/PermissionManager.java b/src/main/java/com/gamingmesh/jobs/PermissionManager.java index 1ca7ee9b..be6031a1 100644 --- a/src/main/java/com/gamingmesh/jobs/PermissionManager.java +++ b/src/main/java/com/gamingmesh/jobs/PermissionManager.java @@ -120,9 +120,9 @@ public class PermissionManager { return getMaxPermission(jPlayer, perm, false); } - public Double getMaxPermission(JobsPlayer jPlayer, String perm, boolean force) { - return getMaxPermission(jPlayer, perm, force, true); - } + public Double getMaxPermission(JobsPlayer jPlayer, String perm, boolean force) { + return getMaxPermission(jPlayer, perm, force, false); + } public Double getMaxPermission(JobsPlayer jPlayer, String perm, boolean force, boolean cumulative) { if (jPlayer == null || jPlayer.getPlayer() == null) @@ -146,19 +146,19 @@ public class PermissionManager { double amount = 0D; for (Map.Entry permission : permissions.entrySet()) { - if (!permission.getKey().startsWith(perm) || !permission.getValue()) - continue; + if (!permission.getKey().startsWith(perm) || !permission.getValue()) + continue; - try { - double temp = Double.parseDouble(permission.getKey().replace(perm, "")); + try { + double temp = Double.parseDouble(permission.getKey().replace(perm, "")); - if (cumulative) - amount += temp; - else if (temp > amount) - amount = temp; + if (cumulative) + amount += temp; + else if (temp > amount) + amount = temp; - } catch (NumberFormatException ignored) { - } + } catch (NumberFormatException ignored) { + } } return amount; diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/join.java b/src/main/java/com/gamingmesh/jobs/commands/list/join.java index b10b4251..bb5881c2 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/join.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/join.java @@ -58,16 +58,15 @@ public class join implements Cmd { return true; } - short PlayerMaxJobs = (short) jPlayer.getJobProgression().size(); - if (!Jobs.getPlayerManager().getJobsLimit(jPlayer, PlayerMaxJobs)) { + if (!Jobs.getPlayerManager().getJobsLimit(jPlayer, (short) jPlayer.getJobProgression().size())) { pSender.sendMessage(Jobs.getLanguage().getMessage("command.join.error.maxjobs")); return true; } if (args.length == 2 && args[1].equalsIgnoreCase("-needConfirmation")) { new RawMessage().addText(Jobs.getLanguage().getMessage("command.join.confirm", "[jobname]", job.getName())) - .addHover(Jobs.getLanguage().getMessage("command.join.confirm", "[jobname]", job.getName())) - .addCommand("jobs join " + job.getName()).show(pSender); + .addHover(Jobs.getLanguage().getMessage("command.join.confirm", "[jobname]", job.getName())) + .addCommand("jobs join " + job.getName()).show(pSender); return true; }