From 12a21076016fb69b4fa97603d2b6fff457192e14 Mon Sep 17 00:00:00 2001
From: shatteredbeam <shatteredbeam@gmail.com>
Date: Tue, 12 Feb 2013 18:06:36 -0800
Subject: [PATCH] More permissions murder.

---
 .../com/gmail/nossr50/commands/admin/XprateCommand.java    | 5 ++---
 .../com/gmail/nossr50/commands/player/InspectCommand.java  | 7 +++----
 .../gmail/nossr50/commands/player/McabilityCommand.java    | 5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/admin/XprateCommand.java b/src/main/java/com/gmail/nossr50/commands/admin/XprateCommand.java
index 32afc7941..970f6b1dd 100644
--- a/src/main/java/com/gmail/nossr50/commands/admin/XprateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/XprateCommand.java
@@ -9,7 +9,6 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 
 public class XprateCommand implements CommandExecutor {
     private static double originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();
@@ -22,7 +21,7 @@ public class XprateCommand implements CommandExecutor {
                 return false;
             }
 
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.xprate.reset")) {
+            if (!sender.hasPermission("mcmmo.commands.xprate.reset")) {
                 sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
@@ -43,7 +42,7 @@ public class XprateCommand implements CommandExecutor {
                 return false;
             }
 
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.xprate.set")) {
+            if (!sender.hasPermission("mcmmo.commands.xprate.set")) {
                 sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
diff --git a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
index f5f88b9b9..a8fcb4cc4 100644
--- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
@@ -11,7 +11,6 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public class InspectCommand implements CommandExecutor {
@@ -21,7 +20,7 @@ public class InspectCommand implements CommandExecutor {
 
         switch (args.length) {
         case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.inspect")) {
+            if (!sender.hasPermission("mcmmo.commands.inspect")) {
                 sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
@@ -37,7 +36,7 @@ public class InspectCommand implements CommandExecutor {
                     return true;
                 }
 
-                if (sender instanceof Player && !Permissions.inspectOffline((Player) sender)) {
+                if (sender instanceof Player && !sender.hasPermission("mcmmo.commands.inspect.offline")) {
                     sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
                     return true;
                 }
@@ -68,7 +67,7 @@ public class InspectCommand implements CommandExecutor {
                 if (sender instanceof Player) {
                     Player inspector = (Player) sender;
 
-                    if (!Misc.isNear(inspector.getLocation(), target.getLocation(), 5.0) && !Permissions.inspectFar(inspector)) {
+                    if (!Misc.isNear(inspector.getLocation(), target.getLocation(), 5.0) && !inspector.hasPermission("mcmmo.commands.inspect.far")) {
                         sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
                         return true;
                     }
diff --git a/src/main/java/com/gmail/nossr50/commands/player/McabilityCommand.java b/src/main/java/com/gmail/nossr50/commands/player/McabilityCommand.java
index 7555525bd..39ba4ec1e 100644
--- a/src/main/java/com/gmail/nossr50/commands/player/McabilityCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McabilityCommand.java
@@ -8,7 +8,6 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
 public class McabilityCommand implements CommandExecutor {
@@ -18,7 +17,7 @@ public class McabilityCommand implements CommandExecutor {
 
         switch (args.length) {
         case 0:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcability")) {
+            if (!sender.hasPermission("mcmmo.commands.mcability")) {
                 sender.sendMessage(command.getPermissionMessage());
                 return true;
             }
@@ -36,7 +35,7 @@ public class McabilityCommand implements CommandExecutor {
             return true;
 
         case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcability.others")) {
+            if (!sender.hasPermission("mcmmo.commands.mcability.others")) {
                 sender.sendMessage(command.getPermissionMessage());
                 return true;
             }