From a85a54aa5d4ee9fea3c578fd6075487e073122d2 Mon Sep 17 00:00:00 2001 From: montlikadani Date: Sun, 13 Sep 2020 20:31:15 +0200 Subject: [PATCH] Add /jobs resetlimit all argument to reset limits for all players Closes #637 --- src/main/java/com/gamingmesh/jobs/Jobs.java | 12 +++--------- .../gamingmesh/jobs/commands/list/resetlimit.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/Jobs.java b/src/main/java/com/gamingmesh/jobs/Jobs.java index 2342d435..c67d36ae 100644 --- a/src/main/java/com/gamingmesh/jobs/Jobs.java +++ b/src/main/java/com/gamingmesh/jobs/Jobs.java @@ -136,10 +136,8 @@ public class Jobs extends JavaPlugin { return false; if (Integer.parseInt(getServer().getPluginManager().getPlugin("PlaceholderAPI") - .getDescription().getVersion().replaceAll("[^\\d]", "")) >= 2100) { - if (new PlaceholderAPIHook(this).register()) { - consoleMsg("&e[Jobs] PlaceholderAPI hooked."); - } + .getDescription().getVersion().replaceAll("[^\\d]", "")) >= 2100 && new PlaceholderAPIHook(this).register()) { + consoleMsg("&e[Jobs] PlaceholderAPI hooked."); } return true; @@ -239,10 +237,6 @@ public class Jobs extends JavaPlugin { return titleManager; } - private void setBBManager() { - bbManager = new BossBarManager(this); - } - public static BossBarManager getBBManager() { return bbManager; } @@ -648,7 +642,7 @@ public class Jobs extends JavaPlugin { YmlMaker restrictedBlocks = new YmlMaker(this, "restrictedBlocks.yml"); restrictedBlocks.saveDefaultConfig(); - setBBManager(); + bbManager = new BossBarManager(this); getCommand("jobs").setExecutor(getCommandManager()); getCommand("jobs").setTabCompleter(new TabComplete()); diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/resetlimit.java b/src/main/java/com/gamingmesh/jobs/commands/list/resetlimit.java index f9fc4416..597edd40 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/resetlimit.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/resetlimit.java @@ -16,6 +16,18 @@ public class resetlimit implements Cmd { return true; } + if (args[0].equalsIgnoreCase("all")) { + for (org.bukkit.entity.Player pl : org.bukkit.Bukkit.getOnlinePlayers()) { + JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(pl); + if (jPlayer != null) { + jPlayer.resetPaymentLimit(); + } + } + + sender.sendMessage(Jobs.getLanguage().getMessage("command.resetlimit.output.reseted", "%playername%", "")); + return true; + } + JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(args[0]); if (jPlayer == null) { sender.sendMessage(Jobs.getLanguage().getMessage("general.error.noinfoByPlayer", "%playername%", args[0]));