Fixed internal name problems with leader

This commit is contained in:
ProSavage 2018-11-06 23:16:11 -06:00
parent 9d21df9c63
commit cd09e77b42
4 changed files with 5 additions and 4 deletions

View File

@ -43,7 +43,7 @@ public class Conf {
public static double powerOfflineLossPerDay = 0.0; // players will lose this much power per day offline public static double powerOfflineLossPerDay = 0.0; // players will lose this much power per day offline
public static double powerOfflineLossLimit = 0.0; // players will no longer lose power from being offline once their power drops to this amount or less public static double powerOfflineLossLimit = 0.0; // players will no longer lose power from being offline once their power drops to this amount or less
public static double powerFactionMax = 0.0; // if greater than 0, the cap on how much power a faction can have (additional power from players beyond that will act as a "buffer" of sorts) public static double powerFactionMax = 0.0; // if greater than 0, the cap on how much power a faction can have (additional power from players beyond that will act as a "buffer" of sorts)
public static String prefixAdmin = "***"; public static String prefixLeader = "***";
public static String prefixCoLeader = "**"; public static String prefixCoLeader = "**";
public static String prefixMod = "*"; public static String prefixMod = "*";
public static String prefixRecruit = "-"; public static String prefixRecruit = "-";

View File

@ -55,6 +55,7 @@ public enum Role implements Permissable {
public static Role fromString(String check) { public static Role fromString(String check) {
switch (check.toLowerCase()) { switch (check.toLowerCase()) {
case "leader":
case "admin": case "admin":
return LEADER; return LEADER;
case "coleader": case "coleader":
@ -92,7 +93,7 @@ public enum Role implements Permissable {
public String getPrefix() { public String getPrefix() {
if (this == Role.LEADER) { if (this == Role.LEADER) {
return Conf.prefixAdmin; return Conf.prefixLeader;
} }
if (this == Role.COLEADER) { if (this == Role.COLEADER) {
return Conf.prefixCoLeader; return Conf.prefixCoLeader;

View File

@ -1197,7 +1197,7 @@ public abstract class MemoryFPlayer implements FPlayer {
return Conf.prefixCoLeader; return Conf.prefixCoLeader;
} }
if (getRole() == Role.LEADER) { if (getRole() == Role.LEADER) {
return Conf.prefixAdmin; return Conf.prefixLeader;
} }
return null; return null;
} }

View File

@ -880,7 +880,7 @@ public enum TL {
/** /**
* Roles * Roles
*/ */
ROLE_LEADER("admin"), ROLE_LEADER("leader"),
ROLE_COLEADER("coleader"), ROLE_COLEADER("coleader"),
ROLE_MODERATOR("moderator"), ROLE_MODERATOR("moderator"),
ROLE_NORMAL("normal member"), ROLE_NORMAL("normal member"),