From 21fa1835ae9217a40780b735fd165b556ad39745 Mon Sep 17 00:00:00 2001
From: Steven Lawson <steven@smlawson.com>
Date: Tue, 20 Sep 2011 12:14:09 -0400
Subject: [PATCH] Added quick op/deop. Fixed some other shit.

---
 .../TotalFreedomMod/TotalFreedomMod.java      | 64 +++++++++++++++++--
 src/plugin.yml                                |  8 ++-
 2 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
index 8e759000..c56c517c 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
@@ -16,12 +16,13 @@ public class TotalFreedomMod extends JavaPlugin
 
     public void onEnable()
     {
-        log.info("[Total Freedom Mod] - Enabled! - v1.0.0 by Madgeek1450");
+        log.log(Level.INFO, "[Total Freedom Mod] - Enabled! - Version: " + this.getDescription().getVersion() + " by Madgeek1450");
+        log.log(Level.WARNING, "[Total Freedom Mod]: In-game superadmin commands wont work if online-mode is set to false!");
     }
 
     public void onDisable()
     {
-        log.info("[Total Freedom Mod] - Disabled.");
+        log.log(Level.INFO, "[Total Freedom Mod] - Disabled.");
     }
     
     public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args)
@@ -44,7 +45,7 @@ public class TotalFreedomMod extends JavaPlugin
                 {
                     sender.setOp(true);
                     sender.sendMessage(ChatColor.YELLOW + "You are now op!");
-                    log.log(Level.INFO, "[Total Freedom Mod]: {0} gave themselves op.", sender.getName());
+                    log.log(Level.INFO, "[Total Freedom Mod]: " + sender.getName() + " gave themselves op.");
                 }
                 else
                 {
@@ -101,7 +102,7 @@ public class TotalFreedomMod extends JavaPlugin
                     }
                 }
                 
-                log.log(Level.INFO, "[Total Freedom Mod]: {0} used deopall.", sender.getName());
+                log.log(Level.INFO, "[Total Freedom Mod]: " + sender.getName() + " used deopall.");
                 Bukkit.broadcastMessage(ChatColor.YELLOW + sender.getName() + " de-op'd everyone on the server.");
             }
             else
@@ -120,7 +121,7 @@ public class TotalFreedomMod extends JavaPlugin
                     p.setOp(true);
                 }
                 
-                log.log(Level.INFO, "[Total Freedom Mod]: {0} used opall.", sender.getName());
+                log.log(Level.INFO, "[Total Freedom Mod]: " + sender.getName() + " used opall.");
                 Bukkit.broadcastMessage(ChatColor.YELLOW + sender.getName() + " op'd everyone on the server.");
             }
             else
@@ -130,11 +131,64 @@ public class TotalFreedomMod extends JavaPlugin
             
             return true;
         }
+        else if(cmd.getName().equalsIgnoreCase("qop")) //Quick OP
+        {
+            if (args.length != 1)
+            {
+                return false;
+            }
+        
+            if (sender.isOp() || player == null || isUserSuperadmin(sender.getName()))
+            {
+                for (Player p : Bukkit.matchPlayer(args[0]))
+                {
+                    p.setOp(true);
+                    Command.broadcastCommandMessage(sender, "Oping " + p.getName());
+                    p.sendMessage(ChatColor.YELLOW + "You are now op!");
+                    log.log(Level.INFO, "[Total Freedom Mod]: " + sender.getName() + " op'd " + p.getName() + ".");
+                }
+            }
+            else
+            {
+                sender.sendMessage(ChatColor.YELLOW + "You do not have permission to use this command.");
+            }
+            
+            return true;
+        }
+        else if(cmd.getName().equalsIgnoreCase("qdeop")) //Quick De-op
+        {
+            if (args.length != 1)
+            {
+                return false;
+            }
+        
+            if (sender.isOp() || player == null || isUserSuperadmin(sender.getName()))
+            {
+                for (Player p : Bukkit.matchPlayer(args[0]))
+                {
+                    p.setOp(false);
+                    Command.broadcastCommandMessage(sender, "De-opping " + p.getName());
+                    p.sendMessage(ChatColor.YELLOW + "You are now op!");
+                    log.log(Level.INFO, "[Total Freedom Mod]: " + sender.getName() + " de-op'd " + p.getName() + ".");
+                }
+            }
+            else
+            {
+                sender.sendMessage(ChatColor.YELLOW + "You do not have permission to use this command.");
+            }
+            
+            return true;
+        }
         return false; 
     }
     
     private boolean isUserSuperadmin(String userName)
     {
+        if (!Bukkit.getOnlineMode())
+        {
+            return false;
+        }
+        
         return Arrays.asList(
                 "miwojedk",
                 "markbyron",
diff --git a/src/plugin.yml b/src/plugin.yml
index 40194037..bf30628b 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: TotalFreedomMod
 main: me.StevenLawson.TotalFreedomMod.TotalFreedomMod
-version: 1.0.0
+version: 1.0.1
 description: Plugin for the Total Freedom server
 author: StevenLawson / Madgeek1450
 commands:
@@ -16,3 +16,9 @@ commands:
   opme:
     description: Superadmin command - Automatically ops user.
     usage: /<command>
+  qdeop:
+    description: Quick De-Op - deop someone based on a partial name.
+    usage: /<command> [partialname]
+  qop:
+    description: Quick Op - op someone based on a partial name.
+    usage: /<command> [partialname]