diff --git a/pom.xml b/pom.xml
index e2f0d0e..d9bbcc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
cn.lunadeer
MiniPlayerTitle
- 4.2.2
+ 4.2.3
jar
MiniPlayerTitle
diff --git a/src/main/java/cn/lunadeer/miniplayertitle/Events.java b/src/main/java/cn/lunadeer/miniplayertitle/Events.java
index 2d0ad49..02f55a7 100644
--- a/src/main/java/cn/lunadeer/miniplayertitle/Events.java
+++ b/src/main/java/cn/lunadeer/miniplayertitle/Events.java
@@ -10,7 +10,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
-import static cn.lunadeer.miniplayertitle.Expansion.isPapi;
+import static cn.lunadeer.miniplayertitle.MiniPlayerTitle.usingPapi;
import static cn.lunadeer.miniplayertitle.commands.Apis.updateName;
public class Events implements Listener {
@@ -39,7 +39,7 @@ public class Events implements Listener {
@EventHandler
public void onPlayerSendChat(AsyncChatEvent event) {
- if (isPapi()) {
+ if (usingPapi()) {
return;
}
Component nameComponent = event.getPlayer().displayName();
diff --git a/src/main/java/cn/lunadeer/miniplayertitle/Expansion.java b/src/main/java/cn/lunadeer/miniplayertitle/Expansion.java
index c29e626..f7e2e50 100644
--- a/src/main/java/cn/lunadeer/miniplayertitle/Expansion.java
+++ b/src/main/java/cn/lunadeer/miniplayertitle/Expansion.java
@@ -5,12 +5,13 @@ import cn.lunadeer.miniplayertitle.dtos.PlayerInfoDTO;
import cn.lunadeer.miniplayertitle.dtos.PlayerTitleDTO;
import cn.lunadeer.miniplayertitle.dtos.TitleDTO;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
+import static cn.lunadeer.miniplayertitle.MiniPlayerTitle.usingPapi;
+
public class Expansion extends PlaceholderExpansion {
private final JavaPlugin plugin;
@@ -19,7 +20,7 @@ public class Expansion extends PlaceholderExpansion {
public Expansion(JavaPlugin plugin) {
this.plugin = plugin;
- if (isPapi()) {
+ if (usingPapi()) {
XLogger.info("PlaceholderAPI is enabled, registering expansion...");
this.register();
} else {
@@ -65,8 +66,4 @@ public class Expansion extends PlaceholderExpansion {
public @NotNull String getVersion() {
return plugin.getPluginMeta().getVersion();
}
-
- public static boolean isPapi() {
- return Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
- }
}
diff --git a/src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java b/src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java
index 19f08d6..00d9642 100644
--- a/src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java
+++ b/src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java
@@ -32,7 +32,9 @@ public final class MiniPlayerTitle extends JavaPlugin {
new VaultConnect(this);
}
- new Expansion(this);
+ if (usingPapi()) {
+ new Expansion(this);
+ }
Bukkit.getPluginManager().registerEvents(new Events(), this);
Objects.requireNonNull(Bukkit.getPluginCommand("MiniPlayerTitle")).setExecutor(new Commands());
@@ -69,4 +71,8 @@ public final class MiniPlayerTitle extends JavaPlugin {
public static ConfigManager config;
public static DatabaseManager database;
private GiteaReleaseCheck giteaReleaseCheck;
+
+ public static boolean usingPapi() {
+ return Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI");
+ }
}
diff --git a/src/main/java/cn/lunadeer/miniplayertitle/commands/Apis.java b/src/main/java/cn/lunadeer/miniplayertitle/commands/Apis.java
index 3836fa0..84f06f7 100644
--- a/src/main/java/cn/lunadeer/miniplayertitle/commands/Apis.java
+++ b/src/main/java/cn/lunadeer/miniplayertitle/commands/Apis.java
@@ -8,7 +8,8 @@ import org.bukkit.entity.Player;
import javax.annotation.Nullable;
-import static cn.lunadeer.miniplayertitle.Expansion.isPapi;
+import static cn.lunadeer.miniplayertitle.MiniPlayerTitle.usingPapi;
+
public class Apis {
public static boolean notOpOrConsole(CommandSender sender) {
@@ -23,7 +24,7 @@ public class Apis {
}
public static void updateName(Player player, @Nullable TitleDTO title) {
- if (isPapi()) {
+ if (usingPapi()) {
return;
}
if (title == null || title.getId() == -1) {
diff --git a/src/main/java/cn/lunadeer/miniplayertitle/dtos/TitleDTO.java b/src/main/java/cn/lunadeer/miniplayertitle/dtos/TitleDTO.java
index fce7726..757839f 100644
--- a/src/main/java/cn/lunadeer/miniplayertitle/dtos/TitleDTO.java
+++ b/src/main/java/cn/lunadeer/miniplayertitle/dtos/TitleDTO.java
@@ -6,7 +6,6 @@ import cn.lunadeer.miniplayertitle.MiniPlayerTitle;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.event.HoverEvent;
-import org.bukkit.ChatColor;
import java.sql.ResultSet;
import java.sql.SQLException;