EpicKnarvik97/Factions3
EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some indent style and comment management.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-19 15:01:53 +02:00
parent afe944d3c4
commit c2063a47b2
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/ConfServer.java
View File

@ -272,11 +272,13 @@ public class ConfServer extends SimpleConfig
public static boolean econEnabled = false; public static boolean econEnabled = false;
public static String econUniverseAccount = ""; public static String econUniverseAccount = "";
public static double econCostClaimWilderness = 30.0; public static double econCostClaimWilderness = 30.0;
public static double econCostClaimFromFactionBonus = 30.0; public static double econCostClaimFromFactionBonus = 30.0;
public static double econClaimAdditionalMultiplier = 0.5; public static double econClaimAdditionalMultiplier = 0.5;
public static double econClaimRefundMultiplier = 0.7; public static double econClaimRefundMultiplier = 0.7;
public static double econClaimUnconnectedFee = 0.0; public static double econClaimUnconnectedFee = 0.0;
public static double econCostCreate = 100.0; public static double econCostCreate = 100.0;
public static double econCostSethome = 30.0; public static double econCostSethome = 30.0;
public static double econCostJoin = 0.0; public static double econCostJoin = 0.0;

6
src/com/massivecraft/factions/cmd/CmdFactionsDemote.java
View File

@ -42,7 +42,8 @@ public class CmdFactionsDemote extends FCommand
if (you.getRole() == Rel.MEMBER) 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."); msg("<b>You must be an officer to demote a member to recruit.");
return; return;
} }
@ -51,7 +52,8 @@ public class CmdFactionsDemote extends FCommand
} }
else if (you.getRole() == Rel.OFFICER) 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."); msg("<b>You must be the leader to demote an officer to member.");
return; return;
} }

6
src/com/massivecraft/factions/cmd/CmdFactionsPromote.java
View File

@ -42,7 +42,8 @@ public class CmdFactionsPromote extends FCommand
if (you.getRole() == Rel.RECRUIT) 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."); msg("<b>You must be an officer to promote someone to member.");
return; return;
} }
@ -51,7 +52,8 @@ public class CmdFactionsPromote extends FCommand
} }
else if (you.getRole() == Rel.MEMBER) 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."); msg("<b>You must be the leader to promote someone to officer.");
return; return;
} }

7
src/com/massivecraft/factions/event/FactionsEventDisband.java
View File

@ -36,11 +36,4 @@ public class FactionsEventDisband extends FactionsEventAbstractSender
this.factionId = faction.getId(); this.factionId = faction.getId();
} }
// -------------------------------------------- //
// ASSORTED
// -------------------------------------------- //
} }

2
src/com/massivecraft/factions/event/FactionsEventMembershipChange.java
View File

@ -49,7 +49,7 @@ public class FactionsEventMembershipChange extends FactionsEventAbstractSender
} }
// -------------------------------------------- // // -------------------------------------------- //
// INTERNAL ENUM // REASON ENUM
// -------------------------------------------- // // -------------------------------------------- //
public enum MembershipChangeReason public enum MembershipChangeReason