From 0bd423ef5274d02c7cfd6d250bbe255d3d998df1 Mon Sep 17 00:00:00 2001
From: Dapoulp <74197441+Dapoulp@users.noreply.github.com>
Date: Wed, 3 Sep 2025 13:42:18 +0200
Subject: [PATCH] fix (#1143)

---
 module/data/chat-message/actorRoll.mjs    | 11 ++++++++---
 module/data/fields/action/damageField.mjs |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/data/chat-message/actorRoll.mjs b/module/data/chat-message/actorRoll.mjs
index b6512fbd..91f44edc 100644
--- a/module/data/chat-message/actorRoll.mjs
+++ b/module/data/chat-message/actorRoll.mjs
@@ -55,9 +55,14 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
     }
 
     get action() {
-        const actionItem = this.actionItem;
-        if (!actionItem || !this.source.action) return null;
-        return actionItem.system.actionsList?.find(a => a.id === this.source.action);
+        const actionActor = this.actionActor,
+            actionItem = this.actionItem;
+        if (!this.source.action) return null;
+        if(actionItem)
+            return actionItem.system.actionsList?.find(a => a.id === this.source.action);
+        else if(actionActor?.system.attack?._id === this.source.action)
+            return actionActor.system.attack
+        return null;
     }
 
     get targetMode() {
diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index db43cfb0..816d9cbc 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -57,8 +57,8 @@ export default class DamageField extends fields.SchemaField {
         damageConfig.source.message = config.message?._id ?? messageId;
         damageConfig.directDamage = !!damageConfig.source?.message;
 
-        if(damageConfig.source?.message && game.modules.get('dice-so-nice')?.active)
-            await game.dice3d.waitFor3DAnimationByMessageID(damageConfig.source.message);
+        // if(damageConfig.source?.message && game.modules.get('dice-so-nice')?.active)
+        //     await game.dice3d.waitFor3DAnimationByMessageID(damageConfig.source.message);
 
         const damageResult = await CONFIG.Dice.daggerheart.DamageRoll.build(damageConfig);
         if(!damageResult) return false;