Fixed MustBe TL Error & Added Member F Upgrade

This commit is contained in:
Driftay
2019-06-02 23:13:10 -04:00
parent 420d8e3321
commit f8195caf06
5 changed files with 93 additions and 12 deletions

View File

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.*;
import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.fupgrades.UpgradeType;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
@@ -75,16 +76,23 @@ public class CmdJoin extends FCommand {
}
return;
}
int level = faction.getUpgrade(UpgradeType.MEMBERS);
int limit = 0;
int altLimit = Conf.factionAltMemberLimit;
limit = Conf.factionMemberLimit;
if (level == 0) {
limit = Conf.factionMemberLimit;
} else {
limit = SavageFactions.plugin.getConfig().getInt("fupgrades.MainMenu.Members.Members-Limit.level-" + level);
}
if (limit > 0 && faction.getFPlayers().size() >= limit && !faction.altInvited(fme)) {
msg(TL.COMMAND_JOIN_ATLIMIT, faction.getTag(fme), limit, fplayer.describeTo(fme, false));
return;
}
int altLimit = Conf.factionAltMemberLimit;
if (altLimit > 0 && faction.getAltPlayers().size() >= altLimit && !faction.altInvited(fme)) {
msg(TL.COMMAND_JOIN_ATLIMIT, faction.getTag(fme), altLimit, fplayer.describeTo(fme, false));
return;