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

%jobsr_user_canjoin_$1% placeholder fix

Browse Source
This commit is contained in:
Zrips 2022-03-08 15:58:01 +02:00
parent fe2b70bdc0
commit dfa564aa74
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,8 @@ 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.Logs.CMIDebug;
public class Placeholder { public class Placeholder {
private Jobs plugin; private Jobs plugin;
@ -588,16 +590,13 @@ public class Placeholder {
if (job == null) if (job == null)
return ""; return "";
if (!Jobs.getCommandManager().hasJobPermission(player, job) || user.isInJob(job)) if (!Jobs.getCommandManager().hasJobPermission(player, job) ||
user.isInJob(job) ||
job.getMaxSlots() != null && Jobs.getUsedSlots(job) >= job.getMaxSlots() ||
!job.isIgnoreMaxJobs() && !Jobs.getPlayerManager().getJobsLimit(user, (short) user.progression.size()))
return convert(false); return convert(false);
if (job.getMaxSlots() != null && Jobs.getUsedSlots(job) >= job.getMaxSlots()) return convert(true);
return convert(false);
int confMaxJobs = Jobs.getGCManager().getMaxJobs();
short playerMaxJobs = (short) user.progression.size();
return convert(confMaxJobs > 0 && playerMaxJobs >= confMaxJobs
&& !Jobs.getPlayerManager().getJobsLimit(user, playerMaxJobs));
case maxjobs: case maxjobs:
return Integer.toString(Jobs.getPlayerManager().getMaxJobs(user)); return Integer.toString(Jobs.getPlayerManager().getMaxJobs(user));