From 6714bb8c1506e6917b7aaad3e8e57379aac8e0f6 Mon Sep 17 00:00:00 2001 From: Wolfsblvt Date: Sun, 15 Sep 2024 17:53:14 +0200 Subject: [PATCH] Prefer current char if multiple have the same name - Match against current chat character first - Also removed avatar-key matching, it was broken --- public/scripts/slash-commands.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/scripts/slash-commands.js b/public/scripts/slash-commands.js index 37e99615d..01f1dbb37 100644 --- a/public/scripts/slash-commands.js +++ b/public/scripts/slash-commands.js @@ -3138,12 +3138,12 @@ export async function sendMessageAs(args, text) { const isSystem = bias && !removeMacros(mesText).length; const compact = isTrueBoolean(args?.compact); - const character = characters.find(x => x.avatar === name) ?? characters.find(x => x.name === name); - let force_avatar, original_avatar; - const chatCharacter = this_chid !== undefined ? characters[this_chid] : null; const isNeutralCharacter = !chatCharacter && name2 === neutralCharacterName && name === neutralCharacterName; + const character = chatCharacter.name === name ? chatCharacter : characters.find(x => x.name === name); + let force_avatar, original_avatar; + if (chatCharacter === character || isNeutralCharacter) { // If the targeted character is the currently selected one in a solo chat, we don't need to force any avatars }