diff --git a/pom.xml b/pom.xml index 696da69..f53b5d9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.lunadeer MiniPlayerTitle - 4.2.4 + 4.2.5 jar MiniPlayerTitle 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 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()) {