From b2dd820507ec4193f40c9ea6ac87aa8e1911262a Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Thu, 25 Apr 2013 09:27:48 -0400
Subject: [PATCH] Clean up a few more things.

---
 .../nossr50/listeners/PlayerListener.java     |  2 +-
 .../nossr50/listeners/WorldListener.java      | 10 +++++--
 src/main/java/com/gmail/nossr50/mcMMO.java    | 26 ++++++++++++-------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
index 614adaf14..51005dadc 100644
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -276,7 +276,7 @@ public class PlayerListener implements Listener {
             player.sendMessage(LocaleLoader.getString("XPRate.Event", Config.getInstance().getExperienceGainsGlobalMultiplier()));
         }
 
-        if (Permissions.updateNotifications(player) && mcMMO.p.updateAvailable) {
+        if (Permissions.updateNotifications(player) && plugin.isUpdateAvailable()) {
             player.sendMessage(LocaleLoader.getString("UpdateChecker.outdated"));
             player.sendMessage(LocaleLoader.getString("UpdateChecker.newavailable"));
         }
diff --git a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
index 9115174b4..7d02cb530 100644
--- a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
@@ -21,6 +21,12 @@ import com.gmail.nossr50.util.blockmeta.conversion.BlockStoreConversionMain;
 public class WorldListener implements Listener {
     private ArrayList<BlockStoreConversionMain> converters = new ArrayList<BlockStoreConversionMain>();
 
+    private final mcMMO plugin;
+
+    public WorldListener(final mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
     /**
      * Monitor StructureGrow events.
      *
@@ -47,11 +53,11 @@ public class WorldListener implements Listener {
         World world = event.getWorld();
         File dataDir = new File(world.getWorldFolder(), "mcmmo_data");
 
-        if (!dataDir.exists() || mcMMO.p == null) {
+        if (!dataDir.exists() || plugin == null) {
             return;
         }
 
-        mcMMO.p.getLogger().info("Converting block storage for " + world.getName() + " to a new format.");
+        plugin.getLogger().info("Converting block storage for " + world.getName() + " to a new format.");
 
         BlockStoreConversionMain converter = new BlockStoreConversionMain(world);
         converter.run();
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 8bfc20f89..7d2f3b4ac 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -55,36 +55,38 @@ import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.spout.SpoutUtils;
 
 public class mcMMO extends JavaPlugin {
+    /* Listeners */
     private final PlayerListener    playerListener    = new PlayerListener(this);
     private final BlockListener     blockListener     = new BlockListener(this);
     private final EntityListener    entityListener    = new EntityListener(this);
     private final InventoryListener inventoryListener = new InventoryListener(this);
+    private final WorldListener     worldListener     = new WorldListener(this);
     private final SelfListener      selfListener      = new SelfListener();
-    private final WorldListener     worldListener     = new WorldListener();
-
-    public static mcMMO p;
 
+    /* Managers */
     private static ChunkManager placeStore;
     private static RepairableManager repairableManager;
     private static DatabaseManager databaseManager;
 
-    // Jar Stuff
-    public static File mcmmo;
-
-    // File Paths
+    /* File Paths */
     private static String mainDirectory;
     private static String flatFileDirectory;
     private static String usersFile;
     private static String modDirectory;
 
+    public static mcMMO p;
+
+    // Jar Stuff
+    public static File mcmmo;
+
     // Update Check
-    public boolean updateAvailable;
+    private boolean updateAvailable;
 
     // Spout Check
-    public static boolean spoutEnabled = false;
+    public static boolean spoutEnabled;
 
     // XP Event Check
-    private boolean xpEventEnabled = false;
+    private boolean xpEventEnabled;
 
     // Metadata Values
     public final static String entityMetadataKey   = "mcMMO: Spawned Entity";
@@ -206,6 +208,10 @@ public class mcMMO extends JavaPlugin {
         return modDirectory;
     }
 
+    public boolean isUpdateAvailable() {
+        return updateAvailable;
+    }
+
     public boolean isXPEventEnabled() {
         return xpEventEnabled;
     }