From 6e3c2fcb76472530d8a4246ddfa62d6308e0428c Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 12 Apr 2019 15:24:01 -0700 Subject: [PATCH] Fix mcrank cd display --- Changelog.txt | 1 + .../com/gmail/nossr50/commands/player/McrankCommand.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 6bcf2a1ac..9806d5f17 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -10,6 +10,7 @@ Key: Version 2.1.41 Fixed NullPointerException errors when trying to grab PlayerProfiles for players who have not loaded Added new locale string Profile.PendingLoad + Fixed a display error preventing the remaining time on /mcrank from being shown if it was on cooldown Version 2.1.40 (API) mcMMO will now return null in all cases for UserManager.getPlayerProfile() if they have not been loaded yet 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 b07fd4e5f..742f5490d 100644 --- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java @@ -98,7 +98,7 @@ public class McrankCommand implements TabExecutor { long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750); if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) { - sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown")); + sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown", getCDSeconds(mcMMOPlayer, cooldownMillis)); return; } @@ -117,4 +117,8 @@ public class McrankCommand implements TabExecutor { new McrankCommandAsyncTask(playerName, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p); } + + private long getCDSeconds(McMMOPlayer mcMMOPlayer, long cooldownMillis) { + return (System.currentTimeMillis() - (mcMMOPlayer.getDatabaseATS() + cooldownMillis)) / 1000; + } }