diff --git a/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java b/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java index 51131915..752265d5 100644 --- a/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java +++ b/src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java @@ -29,6 +29,7 @@ import com.gamingmesh.jobs.container.blockOwnerShip.BlockOwnerShip; import com.gamingmesh.jobs.container.blockOwnerShip.BlockTypes; import com.gamingmesh.jobs.stuff.TimeManage; +import net.Zrips.CMILib.Locale.LC; import net.Zrips.CMILib.Logs.CMIDebug; public class Placeholder { @@ -465,12 +466,10 @@ public class Placeholder { String jobNames = ""; for (JobProgression prog : user.progression) { if (!jobNames.isEmpty()) { - jobNames += ", "; + jobNames += LC.info_ListSpliter.getLocale(); } - jobNames += prog.getJob().getName(); } - return jobNames; case user_quests: String q = ""; @@ -479,14 +478,11 @@ public class Placeholder { if (quest == null || quest.isStopped()) { continue; } - if (!q.isEmpty()) { - q += ", "; + q += LC.info_ListSpliter.getLocale(); } - q += quest.getQuestName(); } - return q; default: break; diff --git a/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java b/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java index 28979fd0..6e931f66 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java +++ b/src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java @@ -140,7 +140,8 @@ public class JobsCommands implements CommandExecutor { boolean pl = sender instanceof Player; - sender.sendMessage(Jobs.getLanguage().getMessage("command.help.output.title")); + // Old format +// sender.sendMessage(Jobs.getLanguage().getMessage("command.help.output.title")); for (String one : commands) { if (!pi.isEntryOk()) continue; @@ -339,7 +340,6 @@ public class JobsCommands implements CommandExecutor { for (JobInfo info : job.getJobInfo(type)) { String materialName = info.getRealisticName(); - double income = info.getIncome(level, numjobs, player.maxJobsEquation); diff --git a/src/main/java/com/gamingmesh/jobs/container/blockOwnerShip/BlockOwnerShip.java b/src/main/java/com/gamingmesh/jobs/container/blockOwnerShip/BlockOwnerShip.java index cfad0efe..3b912c04 100644 --- a/src/main/java/com/gamingmesh/jobs/container/blockOwnerShip/BlockOwnerShip.java +++ b/src/main/java/com/gamingmesh/jobs/container/blockOwnerShip/BlockOwnerShip.java @@ -204,6 +204,10 @@ public class BlockOwnerShip { String blockLoc = CMILocation.toString(block.getLocation(), ":", true, true); com.gamingmesh.jobs.stuff.blockLoc record = ls.get(blockLoc); if (record != null) { + + if (record.isDisabled()) + return false; + record.setDisabled(true); return true; }