From e3d036a57d6587f786922e8986529738617f765d Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Fri, 19 Jan 2024 16:05:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=A7=E8=A1=8C=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E6=97=B6=E6=A3=80=E6=B5=8B=20PlaceholderAPI=20=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E5=B9=B6=E6=9B=BF=E6=8D=A2=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core-bukkit/build.gradle.kts                                 | 3 +++
 .../hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts
index 0919ccd..25a967f 100644
--- a/core-bukkit/build.gradle.kts
+++ b/core-bukkit/build.gradle.kts
@@ -13,6 +13,9 @@ dependencies {
     compileOnly("org.black_ixx:playerpoints:3.2.6") {
         isTransitive = false
     }
+    compileOnly("me.clip:placeholderapi:2.11.5") {
+        isTransitive = false
+    }
 
     implementation("net.kyori:adventure-platform-bukkit:4.3.2") {
         exclude(group = "org.jetbrains")
diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
index 0afe77b..00d5141 100644
--- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
+++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java
@@ -5,6 +5,7 @@ import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
 import com.google.gson.JsonObject;
 import de.tr7zw.changeme.nbtapi.NBTContainer;
 import de.tr7zw.changeme.nbtapi.NBTItem;
+import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.kyori.adventure.title.Title;
@@ -386,6 +387,10 @@ public final class CoreBukkitUtils {
 
     @SuppressWarnings("CallToPrintStackTrace")
     public static void executeCommand(@NotNull Player player, @NotNull String command) {
+        command = command.replace("%player_name%", player.getName());
+        if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
+            command = PlaceholderAPI.setPlaceholders(player, command);
+        }
         String[] split = command.split(":", 2);
         try {
             switch (split[0]) {