From 3fdb5be9f5cba869d1220a0f1b747b168af5ca4d Mon Sep 17 00:00:00 2001 From: montlikadani Date: Fri, 7 May 2021 15:58:22 +0200 Subject: [PATCH] Update documentation of job name --- .../com/gamingmesh/jobs/container/Job.java | 20 +++++++++---------- .../jobs/economy/BufferedEconomy.java | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/container/Job.java b/src/main/java/com/gamingmesh/jobs/container/Job.java index 420e568c..1b8a451c 100644 --- a/src/main/java/com/gamingmesh/jobs/container/Job.java +++ b/src/main/java/com/gamingmesh/jobs/container/Job.java @@ -328,14 +328,22 @@ public class Job { } /** - * Returns the full job name + * Returns the name of this job * - * @return the full job name + * @return the name of this job */ public String getName() { return jobName; } + public String getJobFullName() { + return fullName; + } + + public String getJobDisplayName() { + return jobDisplayName == null ? jobColour + fullName : jobDisplayName; + } + /** * Return the job full name with the set of color. * @@ -675,14 +683,6 @@ public class Job { return obj instanceof Job && isSame((Job) obj); } - public String getJobFullName() { - return fullName; - } - - public String getJobDisplayName() { - return jobDisplayName == null ? jobColour + fullName : jobDisplayName; - } - public void setJobDisplayName(String jobDisplayName) { this.jobDisplayName = jobDisplayName; } diff --git a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java index 41eb367a..0102c062 100644 --- a/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java +++ b/src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java @@ -170,7 +170,7 @@ public class BufferedEconomy { economy.depositPlayer(serverTaxesAccount, taxesAmount); } - if (serverTaxesAccount.isOnline() && Jobs.getGCManager().ActionBarsMessageByDefault) { + if (Jobs.getGCManager().ActionBarsMessageByDefault && serverTaxesAccount.isOnline()) { ActionBarManager.send(Bukkit.getPlayer(serverAccountName), Jobs.getLanguage().getMessage("message.taxes", "[amount]", (int) (totalAmount * 100) / 100.0)); }