From 834da89d10655c45d0cbbab8eee11ffdeef3ca98 Mon Sep 17 00:00:00 2001 From: montlikadani Date: Sat, 7 Dec 2019 14:58:34 +0100 Subject: [PATCH] Fixed when the boost commands are not worked --- Changelog.txt | 1 + .../jobs/commands/list/expboost.java | 31 +++++++++------- .../jobs/commands/list/moneyboost.java | 35 +++++++++--------- .../jobs/commands/list/pointboost.java | 37 ++++++++----------- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index e5a7130f..bce3651b 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -4,6 +4,7 @@ - Fixed SQLException when inserting a job - Adding and taking exp should calculating correctly - Fixed exception if the enchantment level is null +- Fixed when the boost commands are not worked # 4.14.0 - Fixed %titlename% placeholder does not showed anything diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java b/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java index a4c6ed11..c4e5a73f 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java @@ -19,17 +19,21 @@ public class expboost implements Cmd { } double rate = 1.0; - if (!args[1].equalsIgnoreCase("all") && !args[0].equalsIgnoreCase("reset")) + if (!args[1].equalsIgnoreCase("all") && !args[0].equalsIgnoreCase("reset")) { try { rate = Double.parseDouble(args[1]); } catch (NumberFormatException e) { Jobs.getCommandManager().sendUsage(sender, "expboost"); return true; } + } - Job job = Jobs.getJob(args[0]); - if (job == null) { - sender.sendMessage(Jobs.getLanguage().getMessage("general.error.job")); + if (args[0].equalsIgnoreCase("all")) { + for (Job one : Jobs.getJobs()) { + one.addBoost(CurrencyType.EXP, rate); + } + + sender.sendMessage(Jobs.getLanguage().getMessage("command.expboost.output.boostalladded", "%boost%", rate)); return true; } @@ -40,7 +44,15 @@ public class expboost implements Cmd { sender.sendMessage(Jobs.getLanguage().getMessage("command.expboost.output.allreset")); return true; - } else if (args[0].equalsIgnoreCase("reset")) { + } + + Job job = Jobs.getJob(args[0]); + if (job == null) { + sender.sendMessage(Jobs.getLanguage().getMessage("general.error.job")); + return true; + } + + if (args[0].equalsIgnoreCase("reset")) { boolean found = false; for (Job one : Jobs.getJobs()) { if (one.getName().equalsIgnoreCase(args[1])) { @@ -56,15 +68,6 @@ public class expboost implements Cmd { } } - if (args[0].equalsIgnoreCase("all")) { - for (Job one : Jobs.getJobs()) { - one.addBoost(CurrencyType.EXP, rate); - } - - sender.sendMessage(Jobs.getLanguage().getMessage("command.expboost.output.boostalladded", "%boost%", rate)); - return true; - } - job.addBoost(CurrencyType.EXP, rate); sender.sendMessage(Jobs.getLanguage().getMessage("command.expboost.output.boostadded", "%boost%", rate, "%jobname%", job.getName())); return true; diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java b/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java index fe542a72..1d079a6a 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java @@ -13,27 +13,29 @@ public class moneyboost implements Cmd { @Override @JobCommand(2400) public boolean perform(Jobs plugin, final CommandSender sender, final String[] args) { - if (args.length > 2 || args.length <= 1) { Jobs.getCommandManager().sendUsage(sender, "moneyboost"); return true; } double rate = 1.0; - if (!args[1].equalsIgnoreCase("all") && !args[0].equalsIgnoreCase("reset")) + if (!args[1].equalsIgnoreCase("all") && !args[0].equalsIgnoreCase("reset")) { try { rate = Double.parseDouble(args[1]); } catch (NumberFormatException e) { Jobs.getCommandManager().sendUsage(sender, "moneyboost"); return true; } - - Job job = Jobs.getJob(args[0]); - if (job == null) { - sender.sendMessage(Jobs.getLanguage().getMessage("general.error.job")); - return true; } + if (args[0].equalsIgnoreCase("all")) { + for (Job one : Jobs.getJobs()) { + one.addBoost(CurrencyType.MONEY, rate); + } + + sender.sendMessage(Jobs.getLanguage().getMessage("command.moneyboost.output.boostalladded", "%boost%", rate)); + return true; + } if (args[0].equalsIgnoreCase("reset") && args[1].equalsIgnoreCase("all")) { for (Job one : Jobs.getJobs()) { @@ -42,7 +44,15 @@ public class moneyboost implements Cmd { sender.sendMessage(Jobs.getLanguage().getMessage("command.moneyboost.output.allreset")); return true; - } else if (args[0].equalsIgnoreCase("reset")) { + } + + Job job = Jobs.getJob(args[0]); + if (job == null) { + sender.sendMessage(Jobs.getLanguage().getMessage("general.error.job")); + return true; + } + + if (args[0].equalsIgnoreCase("reset")) { boolean found = false; for (Job one : Jobs.getJobs()) { if (one.getName().equalsIgnoreCase(args[1])) { @@ -58,15 +68,6 @@ public class moneyboost implements Cmd { } } - if (args[0].equalsIgnoreCase("all")) { - for (Job one : Jobs.getJobs()) { - one.addBoost(CurrencyType.MONEY, rate); - } - - sender.sendMessage(Jobs.getLanguage().getMessage("command.moneyboost.output.boostalladded", "%boost%", rate)); - return true; - } - job.addBoost(CurrencyType.MONEY, rate); sender.sendMessage(Jobs.getLanguage().getMessage("command.moneyboost.output.boostadded", "%boost%", rate, "%jobname%", job.getName())); return true; diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java b/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java index c9ab7c00..66f998bc 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java @@ -13,27 +13,27 @@ public class pointboost implements Cmd { @Override @JobCommand(2400) public boolean perform(Jobs plugin, final CommandSender sender, final String[] args) { - if (args.length > 2 || args.length <= 1) { Jobs.getCommandManager().sendUsage(sender, "pointboost"); return true; } double rate = 1.0; - if (!args[1].equalsIgnoreCase("all") && !args[0].equalsIgnoreCase("reset")) + if (!args[1].equalsIgnoreCase("all") && !args[0].equalsIgnoreCase("reset")) { try { rate = Double.parseDouble(args[1]); } catch (NumberFormatException e) { Jobs.getCommandManager().sendUsage(sender, "pointboost"); return true; } + } - String PlayerName = sender.getName(); - String jobName = args[0]; - Job job = Jobs.getJob(jobName); + if (args[0].equalsIgnoreCase("all")) { + for (Job one : Jobs.getJobs()) { + one.addBoost(CurrencyType.POINTS, rate); + } - if (PlayerName == null) { - Jobs.getCommandManager().sendUsage(sender, "pointboost"); + sender.sendMessage(Jobs.getLanguage().getMessage("command.pointboost.output.boostalladded", "%boost%", rate)); return true; } @@ -43,7 +43,15 @@ public class pointboost implements Cmd { } sender.sendMessage(Jobs.getLanguage().getMessage("command.pointboost.output.allreset")); return true; - } else if (args[0].equalsIgnoreCase("reset")) { + } + + Job job = Jobs.getJob(args[0]); + if (job == null) { + sender.sendMessage(Jobs.getLanguage().getMessage("general.error.job")); + return true; + } + + if (args[0].equalsIgnoreCase("reset")) { boolean found = false; for (Job one : Jobs.getJobs()) { if (one.getName().equalsIgnoreCase(args[1])) { @@ -59,19 +67,6 @@ public class pointboost implements Cmd { } } - if (args[0].equalsIgnoreCase("all")) { - - for (Job one : Jobs.getJobs()) { - one.addBoost(CurrencyType.POINTS, rate); - } - - sender.sendMessage(Jobs.getLanguage().getMessage("command.pointboost.output.boostalladded", "%boost%", rate)); - return true; - } - if (job == null) { - sender.sendMessage(Jobs.getLanguage().getMessage("general.error.job")); - return true; - } job.addBoost(CurrencyType.POINTS, rate); sender.sendMessage(Jobs.getLanguage().getMessage("command.pointboost.output.boostadded", "%boost%", rate, "%jobname%", job.getName())); return true;