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

Fix mcrank cd display

Browse Source
This commit is contained in:
nossr50 2019-04-12 15:24:01 -07:00
parent 33a68daa9c
commit 6e3c2fcb76
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -10,6 +10,7 @@ Key:
Version 2.1.41 Version 2.1.41
Fixed NullPointerException errors when trying to grab PlayerProfiles for players who have not loaded Fixed NullPointerException errors when trying to grab PlayerProfiles for players who have not loaded
Added new locale string Profile.PendingLoad 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 Version 2.1.40
(API) mcMMO will now return null in all cases for UserManager.getPlayerProfile() if they have not been loaded yet (API) mcMMO will now return null in all cases for UserManager.getPlayerProfile() if they have not been loaded yet

6
src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
View File

@ -98,7 +98,7 @@ public class McrankCommand implements TabExecutor {
long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750); long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) { if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown")); sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown", getCDSeconds(mcMMOPlayer, cooldownMillis));
return; return;
} }
@ -117,4 +117,8 @@ public class McrankCommand implements TabExecutor {
new McrankCommandAsyncTask(playerName, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p); new McrankCommandAsyncTask(playerName, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
} }
private long getCDSeconds(McMMOPlayer mcMMOPlayer, long cooldownMillis) {
return (System.currentTimeMillis() - (mcMMOPlayer.getDatabaseATS() + cooldownMillis)) / 1000;
}
} }