From 3b87323c41bc097d483b133ccb9ca4a36993d026 Mon Sep 17 00:00:00 2001
From: Jerom van der Sar <jerom@pravian.net>
Date: Sun, 6 Sep 2015 16:46:20 +0200
Subject: [PATCH] Remove /permban list. Resolves #805

---
 .../Commands/Command_permban.java             | 48 ++++---------------
 1 file changed, 8 insertions(+), 40 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java
index 1c6c276f..f1d32a44 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java
@@ -7,8 +7,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Manage permanently banned players and IPs.", usage = "/<command> <list | reload>")
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
+@CommandParameters(description = "Manage permanently banned players and IPs.", usage = "/<command> reload")
 public class Command_permban extends TFM_Command
 {
     @Override
@@ -19,49 +19,17 @@ public class Command_permban extends TFM_Command
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("list"))
-        {
-            dumplist(sender);
-        }
-        else if (args[0].equalsIgnoreCase("reload"))
-        {
-            if (!senderIsConsole)
-            {
-                sender.sendMessage(TFM_Command.MSG_NO_PERMS);
-                return true;
-            }
-            playerMsg("Reloading permban list...", ChatColor.RED);
-            TFM_PermbanList.load();
-            dumplist(sender);
-        }
-        else
+        if (!args[0].equalsIgnoreCase("reload"))
         {
             return false;
         }
 
+        playerMsg("Reloading permban list...", ChatColor.RED);
+        TFM_PermbanList.load();
+        playerMsg("Reloaded permban list.");
+        playerMsg(TFM_PermbanList.getPermbannedIps().size() + " IPs and "
+                + TFM_PermbanList.getPermbannedPlayers().size() + " usernames loaded.");
         return true;
     }
 
-    private void dumplist(CommandSender sender)
-    {
-        if (TFM_PermbanList.getPermbannedPlayers().isEmpty())
-        {
-            playerMsg("No permanently banned player names.");
-        }
-        else
-        {
-            playerMsg(TFM_PermbanList.getPermbannedPlayers().size() + " permanently banned players:");
-            playerMsg(StringUtils.join(TFM_PermbanList.getPermbannedPlayers(), ", "));
-        }
-
-        if (TFM_PermbanList.getPermbannedIps().isEmpty())
-        {
-            playerMsg("No permanently banned IPs.");
-        }
-        else
-        {
-            playerMsg(TFM_PermbanList.getPermbannedIps().size() + " permanently banned IPs:");
-            playerMsg(StringUtils.join(TFM_PermbanList.getPermbannedIps(), ", "));
-        }
-    }
 }