From c2063a47b25934175911c7ac27e73e58e20cfc85 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Fri, 19 Apr 2013 15:01:53 +0200 Subject: [PATCH] Some indent style and comment management. --- src/com/massivecraft/factions/ConfServer.java | 2 ++ src/com/massivecraft/factions/cmd/CmdFactionsDemote.java | 6 ++++-- src/com/massivecraft/factions/cmd/CmdFactionsPromote.java | 6 ++++-- src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java | 2 +- .../massivecraft/factions/event/FactionsEventDisband.java | 7 ------- .../factions/event/FactionsEventMembershipChange.java | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/com/massivecraft/factions/ConfServer.java b/src/com/massivecraft/factions/ConfServer.java index a92189c3..f8d2b81d 100644 --- a/src/com/massivecraft/factions/ConfServer.java +++ b/src/com/massivecraft/factions/ConfServer.java @@ -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; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java b/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java index 899bbb81..2cdbc026 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java @@ -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("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("You must be the leader to demote an officer to member."); return; } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java b/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java index 8a8dc12d..4a8f1ac7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java @@ -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("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("You must be the leader to promote someone to officer."); return; } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java index a3f303c9..1462d10b 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java @@ -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; } diff --git a/src/com/massivecraft/factions/event/FactionsEventDisband.java b/src/com/massivecraft/factions/event/FactionsEventDisband.java index 7d881a22..3ee3081a 100644 --- a/src/com/massivecraft/factions/event/FactionsEventDisband.java +++ b/src/com/massivecraft/factions/event/FactionsEventDisband.java @@ -36,11 +36,4 @@ public class FactionsEventDisband extends FactionsEventAbstractSender this.factionId = faction.getId(); } - // -------------------------------------------- // - // ASSORTED - // -------------------------------------------- // - - - - } diff --git a/src/com/massivecraft/factions/event/FactionsEventMembershipChange.java b/src/com/massivecraft/factions/event/FactionsEventMembershipChange.java index 96e88f74..3d110090 100644 --- a/src/com/massivecraft/factions/event/FactionsEventMembershipChange.java +++ b/src/com/massivecraft/factions/event/FactionsEventMembershipChange.java @@ -49,7 +49,7 @@ public class FactionsEventMembershipChange extends FactionsEventAbstractSender } // -------------------------------------------- // - // INTERNAL ENUM + // REASON ENUM // -------------------------------------------- // public enum MembershipChangeReason