staff -> admins

* rename everything containing staff back to admin (as requested by ryan i've renamed commands like slconfig to saconfig but left "slconfig" as an alias)
* format almost every file correctly
* a few other improvements
This commit is contained in:
speed
2020-12-03 19:28:53 -05:00
parent aae1f524ea
commit 293ea04c56
205 changed files with 1667 additions and 1696 deletions

View File

@ -29,7 +29,7 @@ public class Command_mute extends FreedomCommand
return false;
}
if (args[0].equals("list"))
if (args[0].equalsIgnoreCase("list"))
{
msg("Muted players:");
FPlayer info;
@ -51,9 +51,9 @@ public class Command_mute extends FreedomCommand
return true;
}
if (args[0].equals("purge"))
if (args[0].equalsIgnoreCase("purge"))
{
FUtil.staffAction(sender.getName(), "Unmuting all players.", true);
FUtil.adminAction(sender.getName(), "Unmuting all players.", true);
FPlayer info;
int count = 0;
for (Player mp : server.getOnlinePlayers())
@ -71,15 +71,15 @@ public class Command_mute extends FreedomCommand
return true;
}
if (args[0].equals("all"))
if (args[0].equalsIgnoreCase("all"))
{
FUtil.staffAction(sender.getName(), "Muting all non-staff", true);
FUtil.adminAction(sender.getName(), "Muting all non-admins", true);
FPlayer playerdata;
int counter = 0;
for (Player player : server.getOnlinePlayers())
{
if (!plugin.sl.isStaff(player))
if (!plugin.al.isAdmin(player))
{
player.sendTitle(ChatColor.RED + "You've been muted globally.", ChatColor.YELLOW + "Please be patient and you will be unmuted shortly.", 20, 100, 60);
playerdata = plugin.pl.getPlayer(player);
@ -120,9 +120,9 @@ public class Command_mute extends FreedomCommand
}
FPlayer playerdata = plugin.pl.getPlayer(player);
if (plugin.sl.isStaff(player))
if (plugin.al.isAdmin(player))
{
msg(player.getName() + " is a staff member, and can't be muted.");
msg(player.getName() + " is an admin, and can't be muted.");
return true;
}
@ -140,7 +140,7 @@ public class Command_mute extends FreedomCommand
return true;
}
FUtil.staffAction(sender.getName(), "Muting " + player.getName(), true);
FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true);
if (smite)
{
@ -163,7 +163,7 @@ public class Command_mute extends FreedomCommand
@Override
public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
{
if (!plugin.sl.isStaff(sender))
if (!plugin.al.isAdmin(sender))
{
return null;
}