Skip to content

Commit 0c8c92c

Browse files
Allow prefix and suffix to bleed into display name
1 parent af42904 commit 0c8c92c

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

shared/src/main/java/net/pistonmaster/pistonmotd/shared/StatusPingListener.java

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import net.pistonmaster.pistonmotd.api.PlaceholderUtil;
44
import net.pistonmaster.pistonmotd.kyori.PistonSerializersRelocated;
5-
import net.pistonmaster.pistonmotd.shadow.kyori.adventure.text.Component;
65
import net.pistonmaster.pistonmotd.shared.extensions.VanishAPIExtension;
76
import net.pistonmaster.pistonmotd.shared.utils.LuckPermsWrapper;
87
import net.pistonmaster.pistonmotd.shared.utils.PMHelpers;
@@ -79,23 +78,29 @@ default void handle(PistonStatusPing ping) {
7978
if (hideSample && vanished.contains(player.getUniqueId()))
8079
continue;
8180

82-
Component prefix = Component.empty();
83-
Component suffix = Component.empty();
81+
String prefix = "";
82+
String suffix = "";
8483
if (luckperms) {
8584
LuckPermsWrapper.LuckPermsMeta meta = luckpermsWrapper.getWrappedMeta(player);
8685

8786
if (meta.getPrefix() != null)
88-
prefix = PistonSerializersRelocated.ampersandRGB.deserialize(meta.getPrefix());
87+
prefix = meta.getPrefix();
8988

9089
if (meta.getSuffix() != null)
91-
suffix = PistonSerializersRelocated.ampersandRGB.deserialize(meta.getSuffix());
90+
suffix = meta.getSuffix();
9291
}
9392

94-
String displayName = PistonSerializersRelocated.section.serialize(prefix
95-
.append(PistonSerializersRelocated.section.deserialize(player.getDisplayName())
96-
.append(suffix)))
97-
// Reset character to prevent color bleeding
98-
+ "§r";
93+
String displayName = PistonSerializersRelocated.section.serialize(
94+
PistonSerializersRelocated.ampersandRGB.deserialize("%s%s%s"
95+
.formatted(
96+
prefix,
97+
PistonSerializersRelocated.ampersandRGB.serialize(
98+
PistonSerializersRelocated.sectionRGB.deserialize(player.getDisplayName())),
99+
suffix
100+
)
101+
))
102+
// Reset character to prevent color bleeding
103+
+ "§r";
99104

100105
ping.addSample(player.getUniqueId(), displayName);
101106
}

0 commit comments

Comments
 (0)