mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2024-12-28 12:47:36 +00:00
Fixed developers not having the correct prefix
batch format
This commit is contained in:
parent
24fca9af97
commit
9a48ec04aa
@ -1,3 +1,3 @@
|
||||
#Build Number for ANT. Do not edit!
|
||||
#Tue Dec 03 14:13:20 CET 2013
|
||||
build.number=665
|
||||
#Tue Dec 03 14:18:20 CET 2013
|
||||
build.number=666
|
||||
|
@ -61,7 +61,7 @@ public class Command_list extends TFM_Command
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
names.add(TFM_PlayerRank.fromSender(player).getPrefix() + player.getName());
|
||||
}
|
||||
|
||||
|
@ -717,7 +717,9 @@ public class TFM_PlayerListener implements Listener
|
||||
|
||||
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));
|
||||
}
|
||||
|
||||
|
@ -15,8 +15,6 @@ public enum TFM_PlayerRank
|
||||
SENIOR("a " + ChatColor.LIGHT_PURPLE + "Senior Admin", ChatColor.LIGHT_PURPLE + "[SrA]"),
|
||||
OWNER("the " + ChatColor.BLUE + "Owner", ChatColor.BLUE + "[Owner]"),
|
||||
CONSOLE("The " + ChatColor.DARK_PURPLE + "Console", ChatColor.DARK_PURPLE + "[Console]");
|
||||
|
||||
|
||||
private String loginMessage;
|
||||
private String prefix;
|
||||
|
||||
@ -28,10 +26,11 @@ public enum TFM_PlayerRank
|
||||
|
||||
public static TFM_PlayerRank fromSender(CommandSender sender)
|
||||
{
|
||||
if (!(sender instanceof Player)) {
|
||||
if (!(sender instanceof Player))
|
||||
{
|
||||
return CONSOLE;
|
||||
}
|
||||
|
||||
|
||||
if (TFM_SuperadminList.isSuperadminImpostor(sender))
|
||||
{
|
||||
return IMPOSTOR;
|
||||
@ -47,7 +46,7 @@ public enum TFM_PlayerRank
|
||||
{
|
||||
return OWNER;
|
||||
}
|
||||
|
||||
|
||||
if (entry.isSeniorAdmin())
|
||||
{
|
||||
rank = SENIOR;
|
||||
@ -71,7 +70,6 @@ public enum TFM_PlayerRank
|
||||
{
|
||||
if (DEVELOPERS.contains(sender.getName()))
|
||||
{
|
||||
rank.setPrefix(ChatColor.DARK_PURPLE + "[Dev]");
|
||||
rank.setLoginMessage("a " + ChatColor.DARK_PURPLE + "Developer");
|
||||
}
|
||||
}
|
||||
@ -86,15 +84,19 @@ public enum TFM_PlayerRank
|
||||
{
|
||||
rank = NON_OP;
|
||||
}
|
||||
|
||||
|
||||
if (DEVELOPERS.contains(sender.getName()))
|
||||
{
|
||||
rank.setPrefix(ChatColor.DARK_PURPLE + "[Dev]");
|
||||
rank.setLoginMessage("a " + ChatColor.DARK_PURPLE + "Developer");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (DEVELOPERS.contains(sender.getName()))
|
||||
{
|
||||
rank.setPrefix(ChatColor.DARK_PURPLE + "[Dev]");
|
||||
}
|
||||
|
||||
return rank;
|
||||
}
|
||||
|
||||
|
@ -418,7 +418,7 @@ public class TFM_Util
|
||||
@Deprecated
|
||||
public static String getRank(CommandSender sender)
|
||||
{
|
||||
return TFM_PlayerRank.fromSender(sender).getLoginMessage();
|
||||
return TFM_PlayerRank.fromSender(sender).getLoginMessage();
|
||||
}
|
||||
|
||||
public static Date parseDateOffset(String time)
|
||||
|
Loading…
Reference in New Issue
Block a user