From e0e75e0499bc9b4388893767d8245e6dd5b7546e Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Tue, 22 Aug 2023 01:05:28 +0800 Subject: [PATCH] 2.2.3.6 --- build.gradle | 2 +- .../net/momirealms/customnameplates/CustomNameplates.java | 6 +++--- .../object/placeholders/NameplatePlaceholders.java | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index ed51478..0f89c37 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '2.2.3.5' +version = '2.2.3.6' repositories { maven {name = "aliyun-repo"; url = "https://maven.aliyun.com/repository/public/"} diff --git a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java index 5f284b1..e6f68b1 100644 --- a/src/main/java/net/momirealms/customnameplates/CustomNameplates.java +++ b/src/main/java/net/momirealms/customnameplates/CustomNameplates.java @@ -114,11 +114,11 @@ public final class CustomNameplates extends JavaPlugin { private void loadLibs() { TimeZone timeZone = TimeZone.getDefault(); String libRepo = timeZone.getID().startsWith("Asia") ? "https://maven.aliyun.com/repository/public/" : "https://repo.maven.apache.org/maven2/"; - LibraryLoader.load("commons-io","commons-io","2.11.0", libRepo); - LibraryLoader.load("org.apache.commons","commons-lang3","3.12.0", libRepo); + LibraryLoader.load("commons-io","commons-io","2.13.0", libRepo); + LibraryLoader.load("org.apache.commons","commons-lang3","3.13.0", libRepo); LibraryLoader.load("com.zaxxer","HikariCP","5.0.1", libRepo); LibraryLoader.load("dev.dejvokep","boosted-yaml","1.3.1", libRepo); - LibraryLoader.load("org.mariadb.jdbc","mariadb-java-client","3.1.2", libRepo); + LibraryLoader.load("org.mariadb.jdbc","mariadb-java-client","3.1.4", libRepo); LibraryLoader.load("mysql","mysql-connector-java","8.0.30", libRepo); } diff --git a/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java b/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java index bb13c64..b68e3ab 100644 --- a/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java +++ b/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java @@ -235,6 +235,8 @@ public class NameplatePlaceholders extends PlaceholderExpansion { current = 1; max = 1; } + if (current >= max) current = max; + if (current < 0) current = 0; int point = (int) ((current / max) * 20); int full_amount = point / 2; int half_amount = point % 2;