Minor tweaks to default config values
This commit is contained in:
parent
99f6087536
commit
684974b336
@ -916,11 +916,13 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
|
||||
}
|
||||
|
||||
if (replacements == null || replacements.isEmpty())
|
||||
{ // faction leader is the only member; one-man faction
|
||||
{
|
||||
// faction leader is the only member; one-man faction
|
||||
if (this.getFlag(FFlag.PERMANENT))
|
||||
{
|
||||
if (oldLeader != null)
|
||||
{
|
||||
// TODO: Where is the logic in this? Why MEMBER? Why not LEADER again? And why not OFFICER or RECRUIT?
|
||||
oldLeader.setRole(Rel.MEMBER);
|
||||
}
|
||||
return;
|
||||
|
@ -98,7 +98,7 @@ public class UConf extends Entity<UConf>
|
||||
// -------------------------------------------- //
|
||||
|
||||
public int factionMemberLimit = 0;
|
||||
public double factionPowerMax = 1000.0;
|
||||
public double factionPowerMax = 0.0;
|
||||
|
||||
public int factionNameLengthMin = 3;
|
||||
public int factionNameLengthMax = 16;
|
||||
@ -108,7 +108,7 @@ public class UConf extends Entity<UConf>
|
||||
// CLAIMS
|
||||
// -------------------------------------------- //
|
||||
|
||||
public boolean claimsMustBeConnected = false;
|
||||
public boolean claimsMustBeConnected = true;
|
||||
public boolean claimingFromOthersAllowed = true;
|
||||
public boolean claimsCanBeUnconnectedIfOwnedByOtherFaction = true;
|
||||
public int claimsRequireMinFactionMembers = 1;
|
||||
@ -145,7 +145,25 @@ public class UConf extends Entity<UConf>
|
||||
|
||||
// commands which will be prevented when in claimed territory of another faction
|
||||
public Map<Rel, List<String>> denyCommandsTerritoryRelation = MUtil.map(
|
||||
Rel.ENEMY, MUtil.list("home", "sethome", "spawn", "tpahere", "tpaccept", "tpa", "warp"),
|
||||
Rel.ENEMY, MUtil.list(
|
||||
"home",
|
||||
"sethome",
|
||||
"tpahere",
|
||||
"tpaccept",
|
||||
"tpa",
|
||||
"warp",
|
||||
"warps",
|
||||
"spawn",
|
||||
"wtp",
|
||||
"uspawn",
|
||||
"utp",
|
||||
"mspawn",
|
||||
"mtp",
|
||||
"fspawn",
|
||||
"ftp",
|
||||
"jspawn",
|
||||
"jtp"
|
||||
),
|
||||
Rel.NEUTRAL, new ArrayList<String>(),
|
||||
Rel.TRUCE, new ArrayList<String>(),
|
||||
Rel.ALLY, new ArrayList<String>(),
|
||||
@ -181,7 +199,7 @@ public class UConf extends Entity<UConf>
|
||||
FactionsEventChunkChangeType.PILLAGE, -10.0
|
||||
);
|
||||
|
||||
public double econCostCreate = 100.0;
|
||||
public double econCostCreate = 200.0;
|
||||
public double econCostSethome = 0.0;
|
||||
public double econCostJoin = 0.0;
|
||||
public double econCostLeave = 0.0;
|
||||
|
@ -10,7 +10,7 @@ import com.massivecraft.factions.entity.MConf;
|
||||
|
||||
public class AlliesChannel extends FactionsChannelAbstract
|
||||
{
|
||||
public static final Set<Rel> targetRelations = EnumSet.of(Rel.MEMBER, Rel.ALLY);
|
||||
public static final Set<Rel> targetRelations = EnumSet.of(Rel.MEMBER, Rel.RECRUIT, Rel.ALLY);
|
||||
@Override public Set<Rel> getTargetRelations() { return targetRelations; }
|
||||
|
||||
@Override public String getName() { return MConf.get().herochatAlliesName; }
|
||||
|
Loading…
Reference in New Issue
Block a user