From 7294175d9c2d738d227553a70066c6543770152e Mon Sep 17 00:00:00 2001 From: T00thpick1 Date: Fri, 8 Mar 2013 22:03:00 -0500 Subject: [PATCH] Messages --- .../gmail/nossr50/commands/player/McrankCommand.java | 10 ++++++++-- .../gmail/nossr50/commands/player/MctopCommand.java | 9 +++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java index cabc1b151..44955b769 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java @@ -1,5 +1,6 @@ package com.gmail.nossr50.commands.player; +import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -122,8 +123,13 @@ public class McrankCommand implements CommandExecutor { } private void sqlDisplay(CommandSender sender, String playerName) { - if (mcMMO.queueManager.contains(sender.getName()) || !mcMMO.queueManager.queue(new McRankAsync(playerName, sender))) { - //Warn that queue is unable to accept + //TODO: Localize messages + if (mcMMO.queueManager.contains(sender.getName())) { + sender.sendMessage(ChatColor.RED + "Please wait for your previous command to process"); + } + if (!mcMMO.queueManager.queue(new McRankAsync(playerName, sender))) { + // This will only run if for some reason it is unable to add to the queue + sender.sendMessage(ChatColor.RED + "Unable to add to queue."); } } } diff --git a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java index c861bcf3f..caf531a47 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java @@ -123,8 +123,13 @@ public class MctopCommand implements CommandExecutor { } private void sqlDisplay(int page, String query, CommandSender sender) { - if (mcMMO.queueManager.contains(sender.getName()) || !mcMMO.queueManager.queue(new McTopAsync(page, query, sender))) { - //Warn that queue is unable to accept + //TODO: Localize messages + if (mcMMO.queueManager.contains(sender.getName())) { + sender.sendMessage(ChatColor.RED + "Please wait for your previous command to process"); + } + if (!mcMMO.queueManager.queue(new McTopAsync(page, query, sender))) { + // This will only run if for some reason it is unable to add to the queue + sender.sendMessage(ChatColor.RED + "Unable to add to queue."); } } }