Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-02 14:29:07 +01:00
Code Issues Projects Releases Wiki Activity

Fix for job titles not working due to tests

Browse Source
This commit is contained in:
montlikadani 2020-10-13 18:48:12 +02:00
parent ac11fbed6a
commit 2c5dcbc5a1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/gamingmesh/jobs/config/TitleManager.java
View File

@ -24,10 +24,11 @@ public class TitleManager {
Title title = null;
for (Title t : titles) {
if (title == null) {
if (t.getLevelReq() <= level && t.getJobName().equalsIgnoreCase(jobName))
if (t.getLevelReq() <= level && (t.getJobName().isEmpty() || t.getJobName().equalsIgnoreCase(jobName)))
title = t;
} else {
if (t.getLevelReq() <= level && t.getLevelReq() > title.getLevelReq() && t.getJobName().equalsIgnoreCase(jobName))
if (t.getLevelReq() <= level && t.getLevelReq() > title.getLevelReq() && (t.getJobName().isEmpty()
|| t.getJobName().equalsIgnoreCase(jobName)))
title = t;
}
}
@ -130,17 +131,17 @@ public class TitleManager {
String jobName = "",
titleName = titleSection.getString(titleKey + ".Name", ""),
titleShortName = titleSection.getString(titleKey + ".ShortName", "");
CMIChatColor titleColor = CMIChatColor.getColor(titleSection.getString(titleKey + ".ChatColour", ""));
CMIChatColor titleColor = CMIChatColor.getColor(titleSection.getString(titleKey + ".ChatColour"));
int levelReq = titleSection.getInt(titleKey + ".levelReq", -1);
if (titleSection.isString(titleKey + ".JobName"))
jobName = titleSection.getString(titleKey + ".JobName", "");
if (titleName.isEmpty()) {
if (titleName == null) {
Jobs.getPluginLogger().severe("Title " + titleKey + " has an invalid Name property. Skipping!");
continue;
}
if (titleShortName.isEmpty()) {
if (titleShortName == null) {
Jobs.getPluginLogger().severe("Title " + titleKey + " has an invalid ShortName property. Skipping!");
continue;
}