Merge branch 'development' into paldiu-local

This commit is contained in:
Paldiu
2021-01-04 13:14:53 -06:00
15 changed files with 177 additions and 64 deletions

View File

@ -39,7 +39,7 @@ public class CommandBlockerEntry
{
if (action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
{
TotalFreedomMod.plugin().ae.autoEject((Player)sender, "You used a prohibited command: " + command);
TotalFreedomMod.getPlugin().ae.autoEject((Player)sender, "You used a prohibited command: " + command);
FUtil.bcastMsg(sender.getName() + " was automatically kicked for using harmful commands.", ChatColor.RED);
return;
}

View File

@ -23,7 +23,7 @@ public enum CommandBlockerRank
public static CommandBlockerRank fromSender(CommandSender sender)
{
Admin admin = Objects.requireNonNull(TotalFreedomMod.plugin()).al.getAdmin(sender);
Admin admin = TotalFreedomMod.getPlugin().al.getAdmin(sender);
if (admin != null)
{
if (admin.getRank() == Rank.SENIOR_ADMIN)