diff --git a/pom.xml b/pom.xml index 78bc76c..c577c70 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ placeholderapi - http://repo.extendedclip.com/content/repositories/placeholderapi/ + https://repo.extendedclip.com/releases/ @@ -30,7 +30,7 @@ me.clip placeholderapi - 2.10.8 + 2.11.6 provided @@ -41,9 +41,11 @@ org.apache.maven.plugins maven-compiler-plugin + 3.14.0 - 7 - 7 + 8 + 8 + UTF-8 diff --git a/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java b/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java index 71c3e68..8c35166 100644 --- a/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java +++ b/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java @@ -30,6 +30,7 @@ import java.text.DecimalFormat; import java.util.HashMap; import java.util.Map; +import java.util.Objects; @SuppressWarnings("unused") public class ProgressExpansion extends PlaceholderExpansion implements Configurable { @@ -160,8 +161,12 @@ public String onRequest(OfflinePlayer player, String identifier) { StringBuilder bar = new StringBuilder(); amtPerSymbol = max / length; progress = (int) Math.floor(placeholder / amtPerSymbol); - if (placeholder >= max) - return full; + progress = Math.min(progress, length); + if (placeholder >= max) { + if (!Objects.equals(full, "none")) { + return full; + } + } while (barLength < progress) { bar.append(completed); barLength++;