From c7c2795f4163695f9cf0186302799b7ee6eca12a Mon Sep 17 00:00:00 2001
From: unknown <jerom.sar@hotmail.com>
Date: Wed, 23 Apr 2014 16:36:11 +0200
Subject: [PATCH] Tweaked /ops and /qop

---
 buildnumber.properties                        |  4 +-
 .../TotalFreedomMod/Commands/Command_ops.java | 51 +++++++++++--------
 .../TotalFreedomMod/Commands/Command_qop.java |  2 +-
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/buildnumber.properties b/buildnumber.properties
index 62dde1b3..37d13678 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Apr 23 16:22:40 CEST 2014
-build.number=792
+#Wed Apr 23 16:35:40 CEST 2014
+build.number=794
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
index 7b045282..1fc92996 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
@@ -1,55 +1,66 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_AdminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manage operators", usage = "/<command> <count | list>")
+@CommandParameters(description = "Manager operators", usage = "/<command> <count | purge>")
 public class Command_ops extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (args.length < 1 || args.length > 1)
+        if (args.length != 1)
         {
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("list"))
+        if (args[0].equals("count"))
         {
-            TFM_Util.playerMsg(sender, "Operators: " + TFM_Util.playerListToNames(server.getOperators()));
+            int totalOps = server.getOperators().size();
+            int onlineOps = 0;
+
+            for (Player player : server.getOnlinePlayers())
+            {
+                if (player.isOp())
+                {
+                    onlineOps++;
+                }
+            }
+
+            playerMsg("Online OPs: " + onlineOps);
+            playerMsg("Offline OPs: " + (totalOps - onlineOps));
+            playerMsg("Total OPs: " + totalOps);
+
             return true;
         }
 
-        if (args[0].equalsIgnoreCase("count"))
+        if (args[0].equals("purge"))
         {
-            int onlineOPs = 0;
-            int offlineOPs = 0;
-            int totalOPs = 0;
+            if (!TFM_AdminList.isSuperAdmin(sender))
+            {
+                playerMsg(TotalFreedomMod.MSG_NO_PERMS);
+                return true;
+            }
+
+            TFM_Util.adminAction(sender.getName(), "Purging all operators", true);
 
             for (OfflinePlayer player : server.getOperators())
             {
+                player.setOp(false);
                 if (player.isOnline())
                 {
-                    onlineOPs++;
+                    playerMsg((Player) player, TotalFreedomMod.YOU_ARE_NOT_OP);
                 }
-                else
-                {
-                    offlineOPs++;
-                }
-                totalOPs++;
             }
-
-            playerMsg("Online OPs: " + onlineOPs);
-            playerMsg("Offline OPs: " + offlineOPs);
-            playerMsg("Total OPs: " + totalOPs);
-
             return true;
         }
 
-        return true;
+        return false;
     }
 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java
index f4d65a7a..977288e7 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 @CommandParameters(description = "Quick Op - op someone based on a partial name.", usage = "/<command> <partialname>")
 public class Command_qop extends TFM_Command
 {