From 9f53b42c41a6886dc81edffc4b63a35f94052b7b Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 6 Sep 2025 22:28:05 +0200
Subject: [PATCH] Fixed promise lockup

---
 module/documents/chatMessage.mjs | 47 +++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index 94e1879a..d8c82af5 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -163,6 +163,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
             return ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
 
         const targetDamage = [];
+        const damagePromises = [];
         for (let target of targets) {
             let damages = foundry.utils.deepClone(this.system.damage);
             if (
@@ -181,28 +182,36 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
             }
 
             this.consumeOnSuccess();
-            const updates = this.system.hasHealing
-                ? await target.actor.takeHealing(damages)
-                : await target.actor.takeDamage(damages, this.system.isDirect);
-            targetDamage.push({ token: target, updates: updates });
+            if (this.system.hasHealing)
+                damagePromises.push(
+                    target.actor.takeHealing(damages).then(updates => targetDamage.push({ token: target, updates }))
+                );
+            else
+                damagePromises.push(
+                    target.actor
+                        .takeDamage(damages, this.system.isDirect)
+                        .then(updates => targetDamage.push({ token: target, updates }))
+                );
         }
 
-        const cls = getDocumentClass('ChatMessage');
-        const msg = {
-            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
-                }
-            )
-        };
+        Promise.all(damagePromises).then(async _ => {
+            const cls = getDocumentClass('ChatMessage');
+            const msg = {
+                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);
+            cls.create(msg);
+        });
     }
 
     getAction(actor, itemId, actionId) {