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

Lets not spam chat with disable message

Browse Source
This commit is contained in:
Zrips 2022-03-12 13:10:33 +02:00
parent 1f98b5fb2b
commit 8bd4ecaa04
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gamingmesh/jobs/Placeholders/Placeholder.java
View File

@ -29,6 +29,7 @@ import com.gamingmesh.jobs.container.blockOwnerShip.BlockOwnerShip;
import com.gamingmesh.jobs.container.blockOwnerShip.BlockTypes; import com.gamingmesh.jobs.container.blockOwnerShip.BlockTypes;
import com.gamingmesh.jobs.stuff.TimeManage; import com.gamingmesh.jobs.stuff.TimeManage;
import net.Zrips.CMILib.Locale.LC;
import net.Zrips.CMILib.Logs.CMIDebug; import net.Zrips.CMILib.Logs.CMIDebug;
public class Placeholder { public class Placeholder {
@ -465,12 +466,10 @@ public class Placeholder {
String jobNames = ""; String jobNames = "";
for (JobProgression prog : user.progression) { for (JobProgression prog : user.progression) {
if (!jobNames.isEmpty()) { if (!jobNames.isEmpty()) {
jobNames += ", "; jobNames += LC.info_ListSpliter.getLocale();
} }
jobNames += prog.getJob().getName(); jobNames += prog.getJob().getName();
} }
return jobNames; return jobNames;
case user_quests: case user_quests:
String q = ""; String q = "";
@ -479,14 +478,11 @@ public class Placeholder {
if (quest == null || quest.isStopped()) { if (quest == null || quest.isStopped()) {
continue; continue;
} }
if (!q.isEmpty()) { if (!q.isEmpty()) {
q += ", "; q += LC.info_ListSpliter.getLocale();
} }
q += quest.getQuestName(); q += quest.getQuestName();
} }
return q; return q;
default: default:
break; break;

4
src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java
View File

@ -140,7 +140,8 @@ public class JobsCommands implements CommandExecutor {
boolean pl = sender instanceof Player; 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) { for (String one : commands) {
if (!pi.isEntryOk()) if (!pi.isEntryOk())
continue; continue;
@ -339,7 +340,6 @@ public class JobsCommands implements CommandExecutor {
for (JobInfo info : job.getJobInfo(type)) { for (JobInfo info : job.getJobInfo(type)) {
String materialName = info.getRealisticName(); String materialName = info.getRealisticName();
double income = info.getIncome(level, numjobs, player.maxJobsEquation); double income = info.getIncome(level, numjobs, player.maxJobsEquation);

4
src/main/java/com/gamingmesh/jobs/container/blockOwnerShip/BlockOwnerShip.java
View File

@ -204,6 +204,10 @@ public class BlockOwnerShip {
String blockLoc = CMILocation.toString(block.getLocation(), ":", true, true); String blockLoc = CMILocation.toString(block.getLocation(), ":", true, true);
com.gamingmesh.jobs.stuff.blockLoc record = ls.get(blockLoc); com.gamingmesh.jobs.stuff.blockLoc record = ls.get(blockLoc);
if (record != null) { if (record != null) {
if (record.isDisabled())
return false;
record.setDisabled(true); record.setDisabled(true);
return true; return true;
} }