mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-06-27 19:24:44 +02:00
Make mcRank Async in SQL
This commit is contained in:
@ -1,43 +1,49 @@
|
||||
package com.gmail.nossr50.commands.mc;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.gmail.nossr50.mcMMO;
|
||||
import com.gmail.nossr50.config.Config;
|
||||
import com.gmail.nossr50.datatypes.SkillType;
|
||||
import com.gmail.nossr50.util.Database;
|
||||
import com.gmail.nossr50.runnables.mcRankAsync;
|
||||
import com.gmail.nossr50.util.Leaderboard;
|
||||
import com.gmail.nossr50.util.Misc;
|
||||
|
||||
public class McrankCommand implements CommandExecutor {
|
||||
|
||||
@Override
|
||||
public boolean onCommand(CommandSender arg0, Command arg1, String arg2, String[] arg3) {
|
||||
//I'm being lazy and making this only work on yourself, I or someone else will make this work on other players in the future :D
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
if(!Config.getInstance().getUseMySQL())
|
||||
Leaderboard.updateLeaderboards(); //Make sure the information is up to date
|
||||
|
||||
if(arg0 instanceof Player) {
|
||||
Player player = (Player) arg0;
|
||||
String playerName = player.getName();
|
||||
|
||||
arg0.sendMessage(ChatColor.GOLD + "-=PERSONAL RANKINGS=-");
|
||||
arg0.sendMessage(ChatColor.RED+"TARGET: "+ChatColor.WHITE+playerName);
|
||||
if(sender instanceof Player) {
|
||||
Player player = (Player) sender;
|
||||
String playerName;
|
||||
switch(args.length){
|
||||
case 0:
|
||||
playerName = player.getName();
|
||||
break;
|
||||
case 1:
|
||||
playerName = args[0];
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
sender.sendMessage(ChatColor.GOLD + "-=PERSONAL RANKINGS=-");
|
||||
sender.sendMessage(ChatColor.RED+"TARGET: "+ChatColor.WHITE+playerName);
|
||||
|
||||
if(Config.getInstance().getUseMySQL()) {
|
||||
sqlDisplay(arg0, playerName);
|
||||
sqlDisplay(sender, playerName);
|
||||
} else {
|
||||
flatfileDisplay(arg0, playerName);
|
||||
flatfileDisplay(sender, playerName);
|
||||
}
|
||||
|
||||
} else {
|
||||
arg0.sendMessage("Command currently not supported for console.");
|
||||
sender.sendMessage("Command currently not supported for console.");
|
||||
}
|
||||
|
||||
return true;
|
||||
@ -54,13 +60,6 @@ public class McrankCommand implements CommandExecutor {
|
||||
|
||||
|
||||
private void sqlDisplay(CommandSender sender, String playerName) {
|
||||
Database database = mcMMO.getPlayerDatabase();
|
||||
Map<String, Integer> skills = database.readSQLRank(playerName);
|
||||
for (SkillType skillType : SkillType.values()) {
|
||||
if (skillType.equals(SkillType.ALL))
|
||||
continue; // We want the overall ranking to be at the bottom
|
||||
sender.sendMessage(ChatColor.YELLOW + Misc.getCapitalized(skillType.name()) + ChatColor.GREEN + " - " + ChatColor.GOLD + "Rank " + ChatColor.WHITE + "#" + ChatColor.GREEN + skills.get(skillType.name()));
|
||||
}
|
||||
sender.sendMessage(ChatColor.YELLOW + "Overall" + ChatColor.GREEN + " - " + ChatColor.GOLD + "Rank " + ChatColor.WHITE + "#" + ChatColor.GREEN + skills.get("ALL"));
|
||||
Bukkit.getScheduler().runTaskAsynchronously(Bukkit.getPluginManager().getPlugin("mcMMO"), new mcRankAsync(playerName, sender));
|
||||
}
|
||||
}
|
||||
|
@ -153,7 +153,7 @@ public class MctopCommand implements CommandExecutor {
|
||||
String tablePrefix = Config.getInstance().getMySQLTablePrefix();
|
||||
Database database = mcMMO.getPlayerDatabase();
|
||||
|
||||
HashMap<Integer, ArrayList<String>> userslist = database.read("SELECT s." + query + ", u.user FROM " + tablePrefix + "skills AS s, " + tablePrefix + "users AS u WHERE (s.user_id = u.id) AND s." + query + " > 0 ORDER BY s." + query + " DESC LIMIT "+((page * 10) - 10)+",10");
|
||||
HashMap<Integer, ArrayList<String>> userslist = database.read("SELECT s." + query + ", u.user, NOW() FROM " + tablePrefix + "skills AS s, " + tablePrefix + "users AS u WHERE (s.user_id = u.id) AND s." + query + " > 0 ORDER BY s." + query + " DESC LIMIT "+((page * 10) - 10)+",10");
|
||||
|
||||
if (query.equals("taming+s.mining+s.woodcutting+s.repair+s.unarmed+s.herbalism+s.excavation+s.archery+s.swords+s.axes+s.acrobatics+s.fishing")) {
|
||||
sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
|
||||
|
Reference in New Issue
Block a user