diff --git a/src/client/graphics/layers/EventsDisplay.ts b/src/client/graphics/layers/EventsDisplay.ts index 7bb364d9b..015e03b5a 100644 --- a/src/client/graphics/layers/EventsDisplay.ts +++ b/src/client/graphics/layers/EventsDisplay.ts @@ -375,7 +375,7 @@ export class EventsDisplay extends LitElement implements Layer { if (event.target) { try { const targetPlayer = this.game.player(event.target); - const targetName = targetPlayer?.name() ?? event.target; + const targetName = targetPlayer?.displayName() ?? event.target; translatedMessage = baseMessage.replace("[P1]", targetName); } catch (e) { console.warn( @@ -386,9 +386,16 @@ export class EventsDisplay extends LitElement implements Layer { } } + let otherPlayerDiplayName: string = ""; + if (event.recipient !== null) { + //'recipient' parameter contains sender ID or recipient ID + const player = this.game.player(event.recipient); + otherPlayerDiplayName = player ? player.displayName() : ""; + } + this.addEvent({ description: translateText(event.isFrom ? "chat.from" : "chat.to", { - user: event.recipient, + user: otherPlayerDiplayName, msg: translatedMessage, }), createdAt: this.game.ticks(), diff --git a/src/core/execution/QuickChatExecution.ts b/src/core/execution/QuickChatExecution.ts index b3f79830f..bb4f5f525 100644 --- a/src/core/execution/QuickChatExecution.ts +++ b/src/core/execution/QuickChatExecution.ts @@ -35,7 +35,7 @@ export class QuickChatExecution implements Execution { this.target, this.recipient.id(), true, - this.sender.name(), + this.sender.id(), ); this.mg.displayChat( @@ -44,11 +44,11 @@ export class QuickChatExecution implements Execution { this.target, this.sender.id(), false, - this.recipient.name(), + this.recipient.id(), ); console.log( - `[QuickChat] ${this.sender.name} → ${this.recipient.name}: ${message}`, + `[QuickChat] ${this.sender.name} → ${this.recipient.displayName}: ${message}`, ); this.active = false;