Many changes for TFM 5.0

Refractoring
Reworked /saconfig
Reworked part of the command system
Removed unused config sections
Refractored part of the config
Fixed bugs with admin list
Actually allow CONSOLE to have senior perms
This commit is contained in:
JeromSar
2016-03-02 20:28:01 +01:00
parent 19ced05110
commit 055973aa37
143 changed files with 939 additions and 954 deletions

View File

@ -89,10 +89,15 @@ public class RankManager extends FreedomService
return getRank((Player) sender);
}
// CONSOLE?
if (sender.getName().equals("CONSOLE")) {
return ConfigEntry.ADMINLIST_CONSOLE_IS_SENIOR.getBoolean() ? PlayerRank.SENIOR_CONSOLE : PlayerRank.TELNET_CONSOLE;
}
// Console admin, get by name
Admin admin = plugin.al.getEntryByName(sender.getName());
// Unknown console: RCON, CONSOLE?
// Unknown console: RCON?
if (admin == null)
{
return PlayerRank.SENIOR_CONSOLE;
@ -109,12 +114,12 @@ public class RankManager extends FreedomService
}
final Admin entry = plugin.al.getAdmin(player);
if (entry == null)
if (entry != null)
{
return player.isOp() ? PlayerRank.OP : PlayerRank.NON_OP;
return entry.getRank();
}
return entry.getRank();
return player.isOp() ? PlayerRank.OP : PlayerRank.NON_OP;
}
@EventHandler(priority = EventPriority.MONITOR)