fuck intellij

This commit is contained in:
2020-08-15 17:42:46 -05:00
parent e77d92407c
commit 53038ca3b2
185 changed files with 1242 additions and 1453 deletions

View File

@ -9,9 +9,9 @@ public enum PermissionEntry
REMOVE("remove"),
OPERATORS("operators"),
MASTER_BUILDERS("master_builders"),
SUPER_ADMINS("super_admins"),
TELNET_ADMINS("telnet_admins"),
SENIOR_ADMINS("senior_admins");
TRIAL_MODS("trial_mods"),
MODS("mods"),
ADMINS("admins");
private final String configName;

View File

@ -40,9 +40,9 @@ public class PermissionManager extends FreedomService
List<String> operatorPermissions;
List<String> masterBuilderPermissions;
List<String> superAdminPermissions;
List<String> telnetAdminPermissions;
List<String> seniorAdminPermissions;
List<String> trialModPermissions;
List<String> modPermissions;
List<String> adminPermissions;
operatorPermissions = PermissionEntry.OPERATORS.getEntry();
permissions.put(Rank.OP, operatorPermissions);
@ -52,19 +52,19 @@ public class PermissionManager extends FreedomService
permissions.put(Title.MASTER_BUILDER, masterBuilderPermissions);
superAdminPermissions = PermissionEntry.SUPER_ADMINS.getEntry();
superAdminPermissions.addAll(masterBuilderPermissions);
permissions.put(Rank.SUPER_ADMIN, superAdminPermissions);
trialModPermissions = PermissionEntry.TRIAL_MODS.getEntry();
trialModPermissions.addAll(masterBuilderPermissions);
permissions.put(Rank.TRIAL_MOD, trialModPermissions);
telnetAdminPermissions = PermissionEntry.TELNET_ADMINS.getEntry();
telnetAdminPermissions.addAll(superAdminPermissions);
permissions.put(Rank.TELNET_ADMIN, superAdminPermissions);
modPermissions = PermissionEntry.MODS.getEntry();
modPermissions.addAll(trialModPermissions);
permissions.put(Rank.MOD, trialModPermissions);
seniorAdminPermissions = PermissionEntry.SENIOR_ADMINS.getEntry();
seniorAdminPermissions.addAll(telnetAdminPermissions);
permissions.put(Rank.SENIOR_ADMIN, seniorAdminPermissions);
adminPermissions = PermissionEntry.ADMINS.getEntry();
adminPermissions.addAll(modPermissions);
permissions.put(Rank.ADMIN, adminPermissions);
int count = PermissionEntry.OPERATORS.getEntry().size() + PermissionEntry.MASTER_BUILDERS.getEntry().size() + PermissionEntry.SUPER_ADMINS.getEntry().size() + PermissionEntry.TELNET_ADMINS.getEntry().size() + PermissionEntry.SENIOR_ADMINS.getEntry().size();
int count = PermissionEntry.OPERATORS.getEntry().size() + PermissionEntry.MASTER_BUILDERS.getEntry().size() + PermissionEntry.TRIAL_MODS.getEntry().size() + PermissionEntry.MODS.getEntry().size() + PermissionEntry.ADMINS.getEntry().size();
FLog.info("Loaded " + count + " permission nodes");
}
@ -100,7 +100,7 @@ public class PermissionManager extends FreedomService
}
}
if (plugin.pl.getData(player).isMasterBuilder() && !plugin.al.isAdmin(player))
if (plugin.pl.getData(player).isMasterBuilder() && !plugin.sl.isStaff(player))
{
if (nodes != null)
{