From 189ae6fcdb68a264e2d35ad386878bbefe1cc219 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Thu, 22 Mar 2012 15:32:31 -0700 Subject: [PATCH] Moved convertToMySQL() into MmoupdateCommand class --- .../commands/general/MmoupdateCommand.java | 18 +++++++++++++++--- src/main/java/com/gmail/nossr50/m.java | 11 ----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java b/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java index 5685b8614..024ab0a80 100644 --- a/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java @@ -8,9 +8,10 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import com.gmail.nossr50.Users; -import com.gmail.nossr50.m; import com.gmail.nossr50.mcPermissions; +import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.runnables.SQLConversionTask; public class MmoupdateCommand implements CommandExecutor { @Override @@ -28,7 +29,7 @@ public class MmoupdateCommand implements CommandExecutor { } player.sendMessage(ChatColor.GRAY + "Starting conversion..."); Users.clearUsers(); - m.convertToMySQL(); + convertToMySQL(); for (Player x : Bukkit.getServer().getOnlinePlayers()) { Users.addUser(x); } @@ -36,4 +37,15 @@ public class MmoupdateCommand implements CommandExecutor { return true; } -} + + /** + * Convert FlatFile data to MySQL data. + */ + private void convertToMySQL() { + if (!LoadProperties.useMySQL) { + return; + } + + Bukkit.getScheduler().scheduleAsyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new SQLConversionTask(), 1); + } +} \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/m.java b/src/main/java/com/gmail/nossr50/m.java index c0929719b..400f85d67 100644 --- a/src/main/java/com/gmail/nossr50/m.java +++ b/src/main/java/com/gmail/nossr50/m.java @@ -265,17 +265,6 @@ public class m { } } - /** - * Convert FlatFile data to MySQL data. - */ - public static void convertToMySQL() { - if (!LoadProperties.useMySQL) { - return; - } - - Bukkit.getScheduler().scheduleAsyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new SQLConversionTask(), 1); - } - /** * Check if a skill level is higher than the max bonus level of the ability. *