From 1160f5134797681add35500fad396f89a1effa97 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Fri, 13 Mar 2026 18:47:55 -0400
Subject: [PATCH] Fix hasDamage checks on non-attack actions

---
 module/data/action/baseAction.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index eea0d6c4..75fc3981 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -354,11 +354,11 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     }
 
     get hasDamage() {
-        return !foundry.utils.isEmpty(this.damage.parts) && this.type !== 'healing';
+        return !foundry.utils.isEmpty(this.damage?.parts) && this.type !== 'healing';
     }
 
     get hasHealing() {
-        return !foundry.utils.isEmpty(this.damage.parts) && this.type === 'healing';
+        return !foundry.utils.isEmpty(this.damage?.parts) && this.type === 'healing';
     }
 
     get hasSave() {