From f5fe78f4d106de0267d074e53d9cfa333433d3f1 Mon Sep 17 00:00:00 2001
From: zhangyuheng <zhangyuheng@lunadeer.cn>
Date: Mon, 1 Jul 2024 01:40:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E7=A7=B0=E5=8F=B7=E5=89=8D=E7=BC=80=E5=90=8E=E7=BC=80?=
 =?UTF-8?q?=E6=9C=AA=E8=A2=AB=E8=A7=A3=E6=9E=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                |  2 +-
 .../java/cn/lunadeer/miniplayertitle/Expansion.java    |  3 +--
 .../cn/lunadeer/miniplayertitle/dtos/TitleDTO.java     | 10 ++++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 696da69..f53b5d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cn.lunadeer</groupId>
     <artifactId>MiniPlayerTitle</artifactId>
-    <version>4.2.4</version>
+    <version>4.2.5</version>
     <packaging>jar</packaging>
 
     <name>MiniPlayerTitle</name>
diff --git a/src/main/java/cn/lunadeer/miniplayertitle/Expansion.java b/src/main/java/cn/lunadeer/miniplayertitle/Expansion.java
index f7e2e50..d76999a 100644
--- a/src/main/java/cn/lunadeer/miniplayertitle/Expansion.java
+++ b/src/main/java/cn/lunadeer/miniplayertitle/Expansion.java
@@ -45,8 +45,7 @@ public class Expansion extends PlaceholderExpansion {
                 return "";
             }
             TitleDTO t = title.getTitle();
-            return ChatColor.translateAlternateColorCodes('&',
-                    MiniPlayerTitle.config.getPrefix() + t.getTitleColoredBukkit() + MiniPlayerTitle.config.getSuffix());
+            return ChatColor.translateAlternateColorCodes('&', t.getTitleColoredBukkit());
         }
 
         return null; //
diff --git a/src/main/java/cn/lunadeer/miniplayertitle/dtos/TitleDTO.java b/src/main/java/cn/lunadeer/miniplayertitle/dtos/TitleDTO.java
index 757839f..fe7ed76 100644
--- a/src/main/java/cn/lunadeer/miniplayertitle/dtos/TitleDTO.java
+++ b/src/main/java/cn/lunadeer/miniplayertitle/dtos/TitleDTO.java
@@ -74,11 +74,9 @@ public class TitleDTO {
     }
 
     public TextComponent getTitleColored() {
-        TextComponent prefix = Component.text(MiniPlayerTitle.config.getPrefix());
-        TextComponent suffix = Component.text(MiniPlayerTitle.config.getSuffix());
-        String[] parts = this.title.split("&#");
+        String title = MiniPlayerTitle.config.getPrefix() + this.title + MiniPlayerTitle.config.getSuffix();
+        String[] parts = title.split("&#");
         List<TextComponent> components = new ArrayList<>();
-        components.add(prefix);
         for (String part : parts) {
             if (part.isEmpty()) {
                 continue;
@@ -94,7 +92,6 @@ public class TitleDTO {
             }
             components.add(Component.text(content, color.getStyle()));
         }
-        components.add(suffix);
         TextComponent.Builder title_component = Component.text();
         for (TextComponent component : components) {
             title_component.append(component);
@@ -110,7 +107,8 @@ public class TitleDTO {
      * @return String
      */
     public String getTitleColoredBukkit() {
-        String title = this.title.replaceAll("&#", "#");
+        String title = MiniPlayerTitle.config.getPrefix() + this.title + MiniPlayerTitle.config.getSuffix();
+        title = title.replaceAll("&#", "#");
         Pattern pattern = Pattern.compile("#[a-fA-F0-9]{6}");
         Matcher matcher = pattern.matcher(title);
         while (matcher.find()) {