EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mcMMO-Dev/mcMMO

Browse Source 
Conflicts:
	src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java
This commit is contained in:
nossr50 2012-04-04 08:07:47 -07:00
commit 6ad32e487f
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/gmail/nossr50/commands/general/MmoupdateCommand.java
View File

@ -8,12 +8,12 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.mcPermissions;
import com.gmail.nossr50.commands.CommandHelper;
import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.runnables.SQLConversionTask;
public class MmoupdateCommand implements CommandExecutor {
<<<<<<< HEAD
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
Player player = null;
@ -39,6 +39,33 @@ public class MmoupdateCommand implements CommandExecutor {
}
/**
=======
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (CommandHelper.noConsoleUsage(sender)) {
return true;
}
if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
return true;
}
sender.sendMessage(ChatColor.GRAY + "Starting conversion..."); //TODO: Needs more locale.
Users.clearUsers();
convertToMySQL();
for (Player x : Bukkit.getServer().getOnlinePlayers()) {
Users.addUser(x);
}
sender.sendMessage(ChatColor.GREEN + "Conversion finished!"); //TODO: Needs more locale.
return true;
}
/**
>>>>>>> d9b4647cf5b277ae33d20e4e78ca67e1712f1ec7
* Convert FlatFile data to MySQL data.
*/
private void convertToMySQL() {
@ -48,4 +75,4 @@ public class MmoupdateCommand implements CommandExecutor {
Bukkit.getScheduler().scheduleAsyncDelayedTask(Bukkit.getPluginManager().getPlugin("mcMMO"), new SQLConversionTask(), 1);
}
}
}