TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-06-28 00:40:36 +00:00
Code Issues Projects Releases Wiki Activity

Fixed developers not having the correct prefix

Browse source 
batch format
This commit is contained in:
unknown 2013-12-03 14:18:38 +01:00
parent 24fca9af97
commit 9a48ec04aa
5 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildnumber.properties
View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Tue Dec 03 14:13:20 CET 2013 #Tue Dec 03 14:18:20 CET 2013
build.number=665 build.number=666

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
View file

@ -61,7 +61,7 @@ public class Command_list extends TFM_Command
{ {
continue; continue;
} }
names.add(TFM_PlayerRank.fromSender(player).getPrefix() + player.getName()); names.add(TFM_PlayerRank.fromSender(player).getPrefix() + player.getName());
} }

4
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
View file

@ -717,7 +717,9 @@ public class TFM_PlayerListener implements Listener
player.setOp(true); player.setOp(true);
} }
} else if (TFM_Util.DEVELOPERS.contains(player.getName())) { }
else if (TFM_Util.DEVELOPERS.contains(player.getName()))
{
TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_Util.getRank(player)); TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_Util.getRank(player));
} }

18
src/me/StevenLawson/TotalFreedomMod/TFM_PlayerRank.java
View file

@ -15,8 +15,6 @@ public enum TFM_PlayerRank
SENIOR("a " + ChatColor.LIGHT_PURPLE + "Senior Admin", ChatColor.LIGHT_PURPLE + "[SrA]"), SENIOR("a " + ChatColor.LIGHT_PURPLE + "Senior Admin", ChatColor.LIGHT_PURPLE + "[SrA]"),
OWNER("the " + ChatColor.BLUE + "Owner", ChatColor.BLUE + "[Owner]"), OWNER("the " + ChatColor.BLUE + "Owner", ChatColor.BLUE + "[Owner]"),
CONSOLE("The " + ChatColor.DARK_PURPLE + "Console", ChatColor.DARK_PURPLE + "[Console]"); CONSOLE("The " + ChatColor.DARK_PURPLE + "Console", ChatColor.DARK_PURPLE + "[Console]");
private String loginMessage; private String loginMessage;
private String prefix; private String prefix;
@ -28,10 +26,11 @@ public enum TFM_PlayerRank
public static TFM_PlayerRank fromSender(CommandSender sender) public static TFM_PlayerRank fromSender(CommandSender sender)
{ {
if (!(sender instanceof Player)) { if (!(sender instanceof Player))
{
return CONSOLE; return CONSOLE;
} }
if (TFM_SuperadminList.isSuperadminImpostor(sender)) if (TFM_SuperadminList.isSuperadminImpostor(sender))
{ {
return IMPOSTOR; return IMPOSTOR;
@ -47,7 +46,7 @@ public enum TFM_PlayerRank
{ {
return OWNER; return OWNER;
} }
if (entry.isSeniorAdmin()) if (entry.isSeniorAdmin())
{ {
rank = SENIOR; rank = SENIOR;
@ -71,7 +70,6 @@ public enum TFM_PlayerRank
{ {
if (DEVELOPERS.contains(sender.getName())) if (DEVELOPERS.contains(sender.getName()))
{ {
rank.setPrefix(ChatColor.DARK_PURPLE + "[Dev]");
rank.setLoginMessage("a " + ChatColor.DARK_PURPLE + "Developer"); rank.setLoginMessage("a " + ChatColor.DARK_PURPLE + "Developer");
} }
} }
@ -86,15 +84,19 @@ public enum TFM_PlayerRank
{ {
rank = NON_OP; rank = NON_OP;
} }
if (DEVELOPERS.contains(sender.getName())) if (DEVELOPERS.contains(sender.getName()))
{ {
rank.setPrefix(ChatColor.DARK_PURPLE + "[Dev]");
rank.setLoginMessage("a " + ChatColor.DARK_PURPLE + "Developer"); rank.setLoginMessage("a " + ChatColor.DARK_PURPLE + "Developer");
} }
} }
if (DEVELOPERS.contains(sender.getName()))
{
rank.setPrefix(ChatColor.DARK_PURPLE + "[Dev]");
}
return rank; return rank;
} }

2
src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
View file

@ -418,7 +418,7 @@ public class TFM_Util
@Deprecated @Deprecated
public static String getRank(CommandSender sender) public static String getRank(CommandSender sender)
{ {
return TFM_PlayerRank.fromSender(sender).getLoginMessage(); return TFM_PlayerRank.fromSender(sender).getLoginMessage();
} }
public static Date parseDateOffset(String time) public static Date parseDateOffset(String time)