From c97be335eee4e5a8818b84de8372d31d2b864359 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Tue, 5 Jun 2012 10:31:10 -0400
Subject: [PATCH] Avoid using mcMMO.p when we can

---
 .../java/com/gmail/nossr50/commands/mc/McmmoCommand.java  | 7 ++++++-
 .../com/gmail/nossr50/commands/spout/XplockCommand.java   | 8 +++++++-
 src/main/java/com/gmail/nossr50/mcMMO.java                | 4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java b/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java
index ca20c588b..e17946155 100644
--- a/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/mc/McmmoCommand.java
@@ -12,6 +12,11 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 
 public class McmmoCommand implements CommandExecutor {
+    private final mcMMO plugin;
+
+    public McmmoCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -20,7 +25,7 @@ public class McmmoCommand implements CommandExecutor {
         sender.sendMessage(mcSplit);
 
         if (Config.getInstance().getDonateMessageEnabled()) {
-            if (mcMMO.p.spoutEnabled && sender instanceof SpoutPlayer) {
+            if (plugin.spoutEnabled && sender instanceof SpoutPlayer) {
                 SpoutPlayer sPlayer = (SpoutPlayer) sender;
 
                 sPlayer.sendNotification(ChatColor.YELLOW + "[mcMMO]" + ChatColor.GOLD + " Donate!", ChatColor.GREEN + "mcmmodev@gmail.com", Material.DIAMOND);
diff --git a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
index 3cadbed3a..6da083106 100644
--- a/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/spout/XplockCommand.java
@@ -20,6 +20,12 @@ import com.gmail.nossr50.util.Skills;
 import com.gmail.nossr50.util.Users;
 
 public class XplockCommand implements CommandExecutor {
+    private final mcMMO plugin;
+
+    public XplockCommand (mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         String usage = ChatColor.RED + "Proper usage is /xplock [skill]";
@@ -28,7 +34,7 @@ public class XplockCommand implements CommandExecutor {
             return true;
         }
 
-        if (!mcMMO.p.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) {
+        if (!plugin.spoutEnabled || !SpoutConfig.getInstance().getXPBarEnabled() || !Config.getInstance().getCommandXPLockEnabled()) {
             sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
             return true;
         }
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index b0f9f6d74..18d6c1720 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -351,7 +351,7 @@ public class mcMMO extends JavaPlugin {
         }
 
         if (configInstance.getCommandmcMMOEnabled()) {
-            getCommand("mcmmo").setExecutor(new McmmoCommand());
+            getCommand("mcmmo").setExecutor(new McmmoCommand(this));
         }
 
         if (configInstance.getCommandMCRefreshEnabled()) {
@@ -416,7 +416,7 @@ public class mcMMO extends JavaPlugin {
 
         //Spout commands
         if (configInstance.getCommandXPLockEnabled()) {
-            getCommand("xplock").setExecutor(new XplockCommand());
+            getCommand("xplock").setExecutor(new XplockCommand(this));
         }
 
         getCommand("mchud").setExecutor(new MchudCommand(this));