From 6c06ba6191b1fe6174facafe75c6e9d1960106ed Mon Sep 17 00:00:00 2001 From: montlikadani Date: Sat, 15 Feb 2020 17:25:23 +0100 Subject: [PATCH] Fix when the user job placeholder not work --- .../java/com/gamingmesh/jobs/Placeholders/Placeholder.java | 7 ++++--- .../java/com/gamingmesh/jobs/config/ConfigManager.java | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java b/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java index 0ce0e529..e33853ea 100644 --- a/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java +++ b/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java @@ -53,7 +53,7 @@ public class Placeholder { user_jexpunf_$1("jname/number"), user_jmaxexpunf_$1("jname/number"), user_jmaxlvl_$1("jname/number"), - user_job$1("jname/number"), + user_job_$1("jname/number"), maxjobs, @@ -448,9 +448,10 @@ public class Placeholder { vals = placeHolder.getComplexValues(value); if (vals.isEmpty()) return ""; + Job jobs = getJobFromValue(vals.get(0)); - return jobs == null ? "" : convert(user.isInJob(jobs)); - case user_job$1: + return jobs == null ? "no" : convert(user.isInJob(jobs)); + case user_job_$1: return j == null ? "none" : j.getJob().getName(); case maxjobs: diff --git a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java index 04210024..a23f6bd4 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java @@ -1160,14 +1160,13 @@ public class ConfigManager { break; default: break; - } if (actionType == ActionType.STRIPLOGS && Version.isCurrentLower(Version.v1_13_R1)) continue; if (material != null && material.getMaterial() != null && material.getMaterial() == Material.AIR) { - log.warning("Job " + jobKey + " " + actionType.getName() + " cant recognize material! (" + key +")"); + log.warning("Job " + jobKey + " " + actionType.getName() + " cant recognize material! (" + key + ")"); continue; }