diff --git a/.gitignore b/.gitignore index 0de2b55..7162ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ ### Eclipse ### .metadata +.idea/ bin/ tmp/ *.tmp diff --git a/pom.xml b/pom.xml index ae239d9..704daec 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.extendedclip.papi.expansion.essentials essentials-expansion - 1.4.0 + 1.5.0 PAPI-Expansion-Essentials PlaceholderAPI expansion for Essentials placeholders @@ -17,7 +17,7 @@ ess-repo - https://repo.essentialsx.net/snapshots/ + https://repo.essentialsx.net/releases/ @@ -25,19 +25,19 @@ org.spigotmc spigot-api - 1.17-R0.1-SNAPSHOT + 1.18.2-R0.1-SNAPSHOT provided me.clip placeholderapi - 2.10.9 + 2.11.1 provided net.essentialsx EssentialsX - 2.19.0-SNAPSHOT + 2.19.3 org.bstats diff --git a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java index 26b8f2e..85ce4b2 100644 --- a/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java +++ b/src/main/java/com/extendedclip/papi/expansion/essentials/EssentialsExpansion.java @@ -56,12 +56,13 @@ public class EssentialsExpansion extends PlaceholderExpansion { private final DecimalFormat format = new DecimalFormat("#,###"); private Essentials essentials; + private BalanceTop baltop; private final String VERSION = getClass().getPackage().getImplementationVersion(); @Override public boolean canRegister() { - return Bukkit.getPluginManager().getPlugin("Essentials") != null; + return Bukkit.getPluginManager().getPlugin("Essentials") != null && Bukkit.getPluginManager().getPlugin("Essentials").isEnabled(); } @Override @@ -73,7 +74,9 @@ public boolean register() { q = getString("formatting.quadrillions", "q"); essentials = (Essentials) Bukkit.getPluginManager().getPlugin("Essentials"); - if (essentials != null) { + if (essentials != null && essentials.isEnabled()) { + baltop = essentials.getBalanceTop(); + baltop.calculateBalanceTopMapAsync(); return super.register(); } return false; @@ -188,7 +191,6 @@ public String onRequest(OfflinePlayer player, @NotNull String identifier) { } if (identifier.startsWith("baltop_")) { - BalanceTop baltop = essentials.getBalanceTop(); Map baltopCache = baltop.getBalanceTopCache(); identifier = identifier.substring(7);