From 6c5f34f6c62dbd8d1830d1f8b8f6cce40c3ec32e Mon Sep 17 00:00:00 2001 From: WBHarry Date: Sun, 26 Oct 2025 20:22:01 +0100 Subject: [PATCH] Fixed token path for message --- module/data/fields/action/damageField.mjs | 6 ++++-- module/documents/chatMessage.mjs | 26 ----------------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs index 43b94e5e..43623c94 100644 --- a/module/data/fields/action/damageField.mjs +++ b/module/data/fields/action/damageField.mjs @@ -100,13 +100,15 @@ export default class DamageField extends fields.SchemaField { if (config.hasHealing) damagePromises.push( - actor.takeHealing(config.damage).then(updates => targetDamage.push({ token: actor.token, updates })) + actor + .takeHealing(config.damage) + .then(updates => targetDamage.push({ token: actor.token ?? actor.prototypeToken, updates })) ); else damagePromises.push( actor .takeDamage(config.damage, config.isDirect) - .then(updates => targetDamage.push({ token: actor.token, updates })) + .then(updates => targetDamage.push({ token: actor.token ?? actor.prototypeToken, updates })) ); } diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs index d795aec0..bb535c6d 100644 --- a/module/documents/chatMessage.mjs +++ b/module/documents/chatMessage.mjs @@ -208,32 +208,6 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { ) ); } - - Promise.all(damagePromises).then(async _ => { - const summaryMessageSettings = game.settings.get( - CONFIG.DH.id, - CONFIG.DH.SETTINGS.gameSettings.Automation - ).summaryMessages; - if (!summaryMessageSettings.damage) return; - - const cls = getDocumentClass('ChatMessage'); - const msg = { - type: 'systemMessage', - user: game.user.id, - speaker: cls.getSpeaker(), - title: game.i18n.localize( - `DAGGERHEART.UI.Chat.damageSummary.${this.system.hasHealing ? 'healingTitle' : 'title'}` - ), - content: await foundry.applications.handlebars.renderTemplate( - 'systems/daggerheart/templates/ui/chat/damageSummary.hbs', - { - targets: targetDamage - } - ) - }; - - cls.create(msg); - }); } async onRollAllSave(event) {