Some indent style and comment management.
This commit is contained in:
parent
afe944d3c4
commit
c2063a47b2
@ -272,11 +272,13 @@ public class ConfServer extends SimpleConfig
|
||||
|
||||
public static boolean econEnabled = false;
|
||||
public static String econUniverseAccount = "";
|
||||
|
||||
public static double econCostClaimWilderness = 30.0;
|
||||
public static double econCostClaimFromFactionBonus = 30.0;
|
||||
public static double econClaimAdditionalMultiplier = 0.5;
|
||||
public static double econClaimRefundMultiplier = 0.7;
|
||||
public static double econClaimUnconnectedFee = 0.0;
|
||||
|
||||
public static double econCostCreate = 100.0;
|
||||
public static double econCostSethome = 30.0;
|
||||
public static double econCostJoin = 0.0;
|
||||
|
@ -42,7 +42,8 @@ public class CmdFactionsDemote extends FCommand
|
||||
|
||||
if (you.getRole() == Rel.MEMBER)
|
||||
{
|
||||
if (!fme.getRole().isAtLeast(Rel.OFFICER)) {
|
||||
if (!fme.getRole().isAtLeast(Rel.OFFICER))
|
||||
{
|
||||
msg("<b>You must be an officer to demote a member to recruit.");
|
||||
return;
|
||||
}
|
||||
@ -51,7 +52,8 @@ public class CmdFactionsDemote extends FCommand
|
||||
}
|
||||
else if (you.getRole() == Rel.OFFICER)
|
||||
{
|
||||
if (!fme.getRole().isAtLeast(Rel.LEADER)) {
|
||||
if (!fme.getRole().isAtLeast(Rel.LEADER))
|
||||
{
|
||||
msg("<b>You must be the leader to demote an officer to member.");
|
||||
return;
|
||||
}
|
||||
|
@ -42,7 +42,8 @@ public class CmdFactionsPromote extends FCommand
|
||||
|
||||
if (you.getRole() == Rel.RECRUIT)
|
||||
{
|
||||
if (!fme.getRole().isAtLeast(Rel.OFFICER)) {
|
||||
if (!fme.getRole().isAtLeast(Rel.OFFICER))
|
||||
{
|
||||
msg("<b>You must be an officer to promote someone to member.");
|
||||
return;
|
||||
}
|
||||
@ -51,7 +52,8 @@ public class CmdFactionsPromote extends FCommand
|
||||
}
|
||||
else if (you.getRole() == Rel.MEMBER)
|
||||
{
|
||||
if (!fme.getRole().isAtLeast(Rel.LEADER)) {
|
||||
if (!fme.getRole().isAtLeast(Rel.LEADER))
|
||||
{
|
||||
msg("<b>You must be the leader to promote someone to officer.");
|
||||
return;
|
||||
}
|
||||
|
@ -43,7 +43,7 @@ public class CmdFactionsUnclaim extends FCommand
|
||||
{
|
||||
double refund = Econ.calculateClaimRefund(myFaction.getLandCount());
|
||||
|
||||
if(ConfServer.bankEnabled && ConfServer.bankFactionPaysLandCosts)
|
||||
if (ConfServer.bankEnabled && ConfServer.bankFactionPaysLandCosts)
|
||||
{
|
||||
if ( ! Econ.modifyMoney(myFaction, refund, "unclaim this land")) return;
|
||||
}
|
||||
|
@ -36,11 +36,4 @@ public class FactionsEventDisband extends FactionsEventAbstractSender
|
||||
this.factionId = faction.getId();
|
||||
}
|
||||
|
||||
// -------------------------------------------- //
|
||||
// ASSORTED
|
||||
// -------------------------------------------- //
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ public class FactionsEventMembershipChange extends FactionsEventAbstractSender
|
||||
}
|
||||
|
||||
// -------------------------------------------- //
|
||||
// INTERNAL ENUM
|
||||
// REASON ENUM
|
||||
// -------------------------------------------- //
|
||||
|
||||
public enum MembershipChangeReason
|
||||
|
Loading…
Reference in New Issue
Block a user