Made things cleaner

src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java

@@ -26,7 +26,7 @@ public class MmoupdateCommand implements CommandExecutor {
         }
 
         sender.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
-        Users.clearUsers();
+        Users.clearAll();
         convertToMySQL();
 
         for (Player x : plugin.getServer().getOnlinePlayers()) {

src/main/java/com/gmail/nossr50/commands/mc/McremoveCommand.java

@@ -102,7 +102,7 @@ public class McremoveCommand implements CommandExecutor {
         PlayerProfile playerProfile = Users.getProfile(player);
 
         if (playerProfile != null) {
-            Users.getProfiles().remove(playerProfile);
+            Users.remove(player.getName());
 
             if (player.isOnline()) {
                 Users.addUser((Player) player);

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -284,20 +284,11 @@ public class mcMMO extends JavaPlugin {
      */
     @Override
     public void onDisable() {
-        //Make sure to save player information if the server shuts down
+        Users.saveAll(); //Make sure to save player information if the server shuts down
-        for (PlayerProfile playerProfile : Users.getProfiles().values()) {
-            playerProfile.save();
-        }
-
         PartyManager.getInstance().saveParties();
-
         getServer().getScheduler().cancelTasks(this); //This removes our tasks
-
+        placeStore.saveAll(); //Save our metadata
-        //Save our metadata
+        placeStore.cleanUp(); //Cleanup empty metadata stores
-        placeStore.saveAll();
-
-        //Cleanup empty metadata stores
-        placeStore.cleanUp();
 
         //Remove other tasks BEFORE starting the Backup, or we just cancel it straight away.
         try {

src/main/java/com/gmail/nossr50/runnables/SQLReconnect.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.runnables;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.util.Database;
 import com.gmail.nossr50.util.Users;
 
@@ -19,11 +18,9 @@ public class SQLReconnect implements Runnable {
         if (!Database.isConnected()) {
             Database.connect();
             if (Database.isConnected()) {
-                for (PlayerProfile playerProfile : Users.getProfiles().values()) {
+                Users.saveAll(); //Save all profiles
-                    playerProfile.save(); //Save all profiles
+                Users.clearAll(); //Clear the profiles
-                }
 
-                Users.clearUsers(); //Clear the profiles
                 for (Player player : plugin.getServer().getOnlinePlayers()) {
                     Users.addUser(player); //Add in new profiles, forcing them to 'load' again from MySQL
                 }

src/main/java/com/gmail/nossr50/util/Users.java

@@ -58,13 +58,31 @@ public class Users {
         return playerProfile;
     }
 
+    /*
+     * Remove a user.
+     * 
+     * @param playerName The name of the player to remove
+     */
+    public static void remove(String playerName) {
+        profiles.remove(playerName);
+    }
+
     /**
      * Clear all users.
      */
-    public static void clearUsers() {
+    public static void clearAll() {
         profiles.clear();
     }
 
+    /*
+     * Save all users.
+     */
+    public static void saveAll() {
+        for (PlayerProfile playerProfile : profiles.values()) {
+            playerProfile.save();
+        }
+    }
+
     /**
      * Get all PlayerProfiles.
      *