diff --git a/build.gradle b/build.gradle index 7671b34..7f82340 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ dependencies { apt "org.projectlombok:lombok:1.18.2" compile 'org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT' + compile('net.milkbowl.vault:VaultAPI:1.6') { exclude group: 'org.bukkit' } diff --git a/src/main/java/sh/okx/rankup/Rankup.java b/src/main/java/sh/okx/rankup/Rankup.java index 6c2a69b..24fe3b2 100644 --- a/src/main/java/sh/okx/rankup/Rankup.java +++ b/src/main/java/sh/okx/rankup/Rankup.java @@ -302,7 +302,9 @@ public class Rankup extends JavaPlugin { if(prestiges != null) { Prestige prestige = prestiges.getByPlayer(player); if(prestige.isLast()) { - getMessage(rank, Message.NO_RANKUP); + getMessage(rank, Message.NO_RANKUP) + .replaceRanks(player, prestige) + .send(player); } } getMessage(rank, prestiges == null ? Message.NO_RANKUP : prestiges.getByPlayer(player).isLast() ? Message.NO_RANKUP : Message.MUST_PRESTIGE) diff --git a/src/main/java/sh/okx/rankup/messages/MessageBuilder.java b/src/main/java/sh/okx/rankup/messages/MessageBuilder.java index 0c09d4e..ef4c423 100644 --- a/src/main/java/sh/okx/rankup/messages/MessageBuilder.java +++ b/src/main/java/sh/okx/rankup/messages/MessageBuilder.java @@ -87,7 +87,11 @@ public class MessageBuilder { * @return an EmptyMessageBuilder if the message is empty, itself otherwise */ public MessageBuilder failIfEmpty() { - if (message.isEmpty()) { + return failIf(message.isEmpty()); + } + + public MessageBuilder failIf(boolean value) { + if (value) { return new EmptyMessageBuilder(); } else { return this; diff --git a/src/main/java/sh/okx/rankup/requirements/requirement/PlaytimeMinutesRequirement.java b/src/main/java/sh/okx/rankup/requirements/requirement/PlaytimeMinutesRequirement.java index 5bf59b0..9af9e6c 100644 --- a/src/main/java/sh/okx/rankup/requirements/requirement/PlaytimeMinutesRequirement.java +++ b/src/main/java/sh/okx/rankup/requirements/requirement/PlaytimeMinutesRequirement.java @@ -26,7 +26,7 @@ public class PlaytimeMinutesRequirement extends Requirement { @Override public boolean check(Player player) { - return player.getStatistic(playOneTick) * TICKS_PER_MINUTE >= getValueDouble(); + return player.getStatistic(playOneTick) / TICKS_PER_MINUTE >= getValueDouble(); } @Override diff --git a/src/main/resources/rankups.yml b/src/main/resources/rankups.yml index 482ba6a..be96f22 100644 --- a/src/main/resources/rankups.yml +++ b/src/main/resources/rankups.yml @@ -45,5 +45,6 @@ Cexample: complete: "&7{OLD_RANK} &8\xbb &7{RANK} &e(5000 money, 2 XP levels)" current: "&c{OLD_RANK} &e\xbb &c{RANK} &e(5000 money, 2 XP levels)" incomplete: "&r{OLD_RANK} &e\xbb &r{RANK} &e(5000 money, 2 XP levels)" +# for the last rank, you just need to specify the rank. Dexample: rank: 'D' \ No newline at end of file