From 357eddf51a0c4683c9b4cd53ac7a2f285fcd760e Mon Sep 17 00:00:00 2001
From: Super_ <awesomegamer156@gmail.com>
Date: Tue, 30 Jun 2020 23:21:44 -0400
Subject: [PATCH] bug fixing

---
 .../totalfreedommod/admin/AdminList.java      | 11 +++++
 .../command/Command_mbconfig.java             | 25 +++-------
 .../command/Command_saconfig.java             | 49 ++++++++-----------
 .../command/FreedomCommand.java               |  2 +-
 4 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java
index deb5a7a7..e77ea19c 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java
@@ -106,6 +106,17 @@ public class AdminList extends FreedomService
         return admin != null && admin.isActive();
     }
 
+    public boolean isTelnetAdmin(CommandSender sender)
+    {
+        Admin admin = getAdmin(sender);
+        if (admin == null)
+        {
+            return false;
+        }
+
+        return admin.getRank().ordinal() >= Rank.TELNET_ADMIN.ordinal();
+    }
+
     public boolean isSeniorAdmin(CommandSender sender)
     {
         Admin admin = getAdmin(sender);
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
index be7c51f1..c140d0f8 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java
@@ -118,30 +118,19 @@ public class Command_mbconfig extends FreedomCommand
     @Override
     public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
     {
-        if (sender instanceof Player)
+        if (args.length == 1)
         {
-            if (args.length == 1)
-            {
-                return Arrays.asList("list");
-            }
-            return Collections.emptyList();
+            return Arrays.asList("add", "remove", "list");
         }
-        else
+        else if (args.length == 2)
         {
-            if (args.length == 1)
+            if (args[0].equals("add"))
             {
-                return Arrays.asList("add", "remove", "list");
+                return FUtil.getPlayerList();
             }
-            else if (args.length == 2)
+            else if (args[0].equals("remove"))
             {
-                if (args[0].equals("add"))
-                {
-                    return FUtil.getPlayerList();
-                }
-                else if (args[0].equals("remove"))
-                {
-                    return plugin.pl.getMasterBuilderNames();
-                }
+                return plugin.pl.getMasterBuilderNames();
             }
         }
         return Collections.emptyList();
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
index 67f2e6c7..7c6ea709 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java
@@ -299,41 +299,34 @@ public class Command_saconfig extends FreedomCommand
     @Override
     public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
     {
-        if (sender instanceof Player)
+        if (args.length == 1)
         {
-            if (args.length == 1)
+            List<String> arguments = new ArrayList<>();
+            arguments.add("list");
+            if (plugin.al.isAdmin(sender))
             {
-                List<String> arguments = new ArrayList<>();
-                arguments.add("list");
-                if (plugin.al.isAdmin(sender))
-                {
-                    arguments.add("info");
-                }
-                return arguments;
+                arguments.add("info");
             }
-            else if (args.length == 2 && args[0].equals("info") && plugin.al.isAdmin(sender))
+            if (plugin.al.isTelnetAdmin(sender))
             {
-                return plugin.al.getActiveAdminNames();
+                arguments.add("add");
+                arguments.add("remove");
             }
-            return Collections.emptyList();
+            if (plugin.al.isSeniorAdmin(sender))
+            {
+                arguments.add("reload");
+                arguments.add("clean");
+                arguments.add("setrank");
+            }
+            return arguments;
         }
-        else
+        if (args.length == 2 && (args[0].equals("add") || args[0].equals("remove") || args[0].equals("setrank") || args[0].equals("info")))
         {
-            if (args.length == 1)
-            {
-                return Arrays.asList("add", "remove", "clean", "reload", "setrank", "info", "list");
-            }
-            else if (args.length == 2)
-            {
-                if (args[0].equals("add") || args[0].equals("remove") || args[0].equals("setrank") || args[0].equals("info"))
-                {
-                    return FUtil.getPlayerList();
-                }
-            }
-            else if (args.length == 3 && args[0].equals("setrank"))
-            {
-                return Arrays.asList("super_admin", "telnet_admin", "senior_admin");
-            }
+            return FUtil.getPlayerList();
+        }
+        if (args.length == 3 && args[0].equals("setrank"))
+        {
+            return Arrays.asList("SUPER_ADMIN", "TELNET_ADMIN", "SENIOR_ADMIN");
         }
 
         return Collections.emptyList();
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java b/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java
index 9efc04a2..bd77ece4 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java
@@ -293,7 +293,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
 
     protected List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
     {
-        return null;
+        return FUtil.getPlayerList();
     }
 
     protected boolean isConsole()