Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing some comments.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-14 21:20:34 +02:00
parent c8d60a8298
commit 96954e4eb2
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/massivecraft/factions/Rel.java
View File

@ -5,6 +5,10 @@ import org.bukkit.ChatColor;
public enum Rel public enum Rel
{ {
// -------------------------------------------- //
// ENUM
// -------------------------------------------- //
LEADER (70, "your faction leader", "your faction leader", "", ""), LEADER (70, "your faction leader", "your faction leader", "", ""),
OFFICER (60, "an officer in your faction", "officers in your faction", "", ""), OFFICER (60, "an officer in your faction", "officers in your faction", "", ""),
MEMBER (50, "a member in your faction", "members in your faction", "your faction", "your factions"), MEMBER (50, "a member in your faction", "members in your faction", "your faction", "your factions"),
@ -13,8 +17,14 @@ public enum Rel
TRUCE (30, "someone in truce with you", "those in truce with you", "a faction in truce", "factions in truce"), TRUCE (30, "someone in truce with you", "those in truce with you", "a faction in truce", "factions in truce"),
NEUTRAL (20, "someone neutral to you", "those neutral to you", "a neutral faction", "neutral factions"), NEUTRAL (20, "someone neutral to you", "those neutral to you", "a neutral faction", "neutral factions"),
ENEMY (10, "an enemy", "enemies", "an enemy faction", "enemy factions"), ENEMY (10, "an enemy", "enemies", "an enemy faction", "enemy factions"),
// END OF LIST
; ;
// -------------------------------------------- //
// FIELDS
// -------------------------------------------- //
private final int value; private final int value;
private final String descPlayerOne; private final String descPlayerOne;
public String getDescPlayerOne() { return this.descPlayerOne; } public String getDescPlayerOne() { return this.descPlayerOne; }
@ -28,6 +38,10 @@ public enum Rel
private final String descFactionMany; private final String descFactionMany;
public String getDescFactionMany() { return this.descFactionMany; } public String getDescFactionMany() { return this.descFactionMany; }
// -------------------------------------------- //
// CONSTRUCT
// -------------------------------------------- //
private Rel(final int value, final String descPlayerOne, final String descPlayerMany, final String descFactionOne, final String descFactionMany) private Rel(final int value, final String descPlayerOne, final String descPlayerMany, final String descFactionOne, final String descFactionMany)
{ {
this.value = value; this.value = value;
@ -37,6 +51,10 @@ public enum Rel
this.descFactionMany = descFactionMany; this.descFactionMany = descFactionMany;
} }
// -------------------------------------------- //
// UTIL
// -------------------------------------------- //
public static Rel parse(String str) public static Rel parse(String str)
{ {
if (str == null || str.length() < 1) return null; if (str == null || str.length() < 1) return null;

3
src/com/massivecraft/factions/cmd/CmdFactions.java
View File

@ -56,9 +56,6 @@ public class CmdFactions extends FCommand
// TODO: When is this required? Should this be added to MCore? // TODO: When is this required? Should this be added to MCore?
this.aliases.removeAll(Collections.singletonList(null)); this.aliases.removeAll(Collections.singletonList(null));
//this.requiredArgs.add("");
//this.optionalArgs.put("","")
senderMustBePlayer = false; senderMustBePlayer = false;
senderMustBeMember = false; senderMustBeMember = false;
senderMustBeOfficer = false; senderMustBeOfficer = false;