Skip to content

Strip color codes from messages where they aren't supported anymore #6438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valaphee merged 1 commit into from
Jun 2, 2026
+2 −2
Merged

Strip color codes from messages where they aren't supported anymore #6438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/org/geysermc/geyser/event/type/SessionDisconnectEventImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class SessionDisconnectEventImpl extends SessionDisconnectEvent {
private final Component reasonComponent;

public SessionDisconnectEventImpl(@NonNull GeyserSession session, Component reason) {
super(session, MessageTranslator.convertMessageRaw(reason, session.locale()));
super(session, MessageTranslator.convertToPlainText(reason, session.locale()));
this.reasonComponent = reason;
}
}
2 changes: 1 addition & 1 deletion core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public BedrockPong onQuery(Channel channel, InetSocketAddress inetSocketAddress)
.serverId(channel.config().getOption(RakChannelOption.RAK_GUID));

if (config.motd().passthroughMotd() && pingInfo != null && pingInfo.getDescription() != null) {
String[] motd = MessageTranslator.convertMessageLenient(pingInfo.getDescription()).split("\n");
String[] motd = MessageTranslator.convertToPlainTextLenient(pingInfo.getDescription(), GeyserLocale.getDefaultLocale()).split("\n");
String mainMotd = (motd.length > 0) ? motd[0] : config.motd().primaryMotd(); // First line of the motd.
String subMotd = (motd.length > 1) ? motd[1] : config.motd().secondaryMotd(); // Second line of the motd if present, otherwise default.

Expand Down
Loading