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

Fixed nossr50's crappy merge. :D

Browse Source
This commit is contained in:
GJ 2012-04-04 11:17:56 -04:00
parent 6ad32e487f
commit 2b7f21fee4
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,40 +13,9 @@ import com.gmail.nossr50.config.LoadProperties;
import com.gmail.nossr50.runnables.SQLConversionTask; import com.gmail.nossr50.runnables.SQLConversionTask;
public class MmoupdateCommand implements CommandExecutor { public class MmoupdateCommand implements CommandExecutor {
<<<<<<< HEAD
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
Player player = null;
if(sender instanceof Player) {
player = (Player)sender;
}
if (sender instanceof Player && !mcPermissions.getInstance().admin(player)) {
sender.sendMessage(ChatColor.YELLOW + "[mcMMO] " + ChatColor.DARK_RED + mcLocale.getString("mcPlayerListener.NoPermission"));
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;
}
/**
=======
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (CommandHelper.noConsoleUsage(sender)) {
return true;
}
if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) { if (CommandHelper.noCommandPermissions(sender, "mcmmo.admin")) {
return true; return true;
} }
@ -65,7 +34,6 @@ public class MmoupdateCommand implements CommandExecutor {
} }
/** /**
>>>>>>> d9b4647cf5b277ae33d20e4e78ca67e1712f1ec7
* Convert FlatFile data to MySQL data. * Convert FlatFile data to MySQL data.
*/ */
private void convertToMySQL() { private void convertToMySQL() {