Skip to content

Commit 371c96a

Browse files
AxyssWarriorrrr
andauthored
Fix username duplication in chat when defaultRenderer is explicitly set (PaperMC#13868)
Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
1 parent 1d254ec commit 371c96a

3 files changed

Lines changed: 7 additions & 10 deletions

File tree

‎paper-api/src/main/java/io/papermc/paper/chat/ChatRenderer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public interface ChatRenderer {
2626
Component render(Player source, Component sourceDisplayName, Component message, Audience viewer);
2727

2828
/**
29-
* Create a new instance of the default {@link ChatRenderer}.
29+
* Gets the default {@link ChatRenderer}.
3030
*
31-
* @return a new {@link ChatRenderer}
31+
* @return the default {@link ChatRenderer}
3232
*/
3333
static ChatRenderer defaultRenderer() {
34-
return new ViewerUnawareImpl.Default((source, sourceDisplayName, message) -> Component.translatable("chat.type.text", sourceDisplayName, message));
34+
return ViewerUnawareImpl.Default.INSTANCE;
3535
}
3636

3737
@ApiStatus.Internal

‎paper-api/src/main/java/io/papermc/paper/chat/ViewerUnawareImpl.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
import org.bukkit.entity.Player;
66
import org.jetbrains.annotations.ApiStatus;
77
import org.jspecify.annotations.NullMarked;
8-
import org.jspecify.annotations.Nullable;
98

109
@ApiStatus.Internal
1110
@NullMarked
1211
sealed class ViewerUnawareImpl implements ChatRenderer, ChatRenderer.ViewerUnaware permits ViewerUnawareImpl.Default {
1312
private final ViewerUnaware unaware;
14-
private @Nullable Component message;
1513

1614
ViewerUnawareImpl(final ViewerUnaware unaware) {
1715
this.unaware = unaware;
@@ -24,13 +22,12 @@ public Component render(final Player source, final Component sourceDisplayName,
2422

2523
@Override
2624
public Component render(final Player source, final Component sourceDisplayName, final Component message) {
27-
if (this.message == null) {
28-
this.message = this.unaware.render(source, sourceDisplayName, message);
29-
}
30-
return this.message;
25+
return this.unaware.render(source, sourceDisplayName, message);
3126
}
3227

3328
static final class Default extends ViewerUnawareImpl implements ChatRenderer.Default {
29+
static final ViewerUnawareImpl.Default INSTANCE = new ViewerUnawareImpl.Default((source, sourceDisplayName, message) -> Component.translatable("chat.type.text", sourceDisplayName, message));
30+
3431
Default(final ViewerUnaware unaware) {
3532
super(unaware);
3633
}

‎paper-server/src/main/java/io/papermc/paper/adventure/ChatProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ protected Void evaluate() {
170170

171171
private void readModernModifications(final AbstractChatEvent chatEvent, final ChatRenderer originalRenderer) {
172172
this.flags.set(MESSAGE_CHANGED, !chatEvent.message().equals(this.paper$originalMessage));
173-
if (originalRenderer != chatEvent.renderer()) { // don't set to false if it hasn't changed
173+
if (originalRenderer != chatEvent.renderer()) { // don't set to true if it hasn't changed
174174
this.flags.set(FORMAT_CHANGED, true);
175175
}
176176
}

0 commit comments

Comments
 (0)