From a9ac8fe148204f50c7cfd29525b11272f9d2fde8 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Wed, 22 Jul 2026 03:44:10 +0200
Subject: [PATCH] Fixed so that non attack/damage actions don't error out when
 used (#2098)

---
 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 05890335..7c783f05 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -429,11 +429,11 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     }
 
     get hasDamage() {
-        return this.type !== 'healing' && (Boolean(this.damage.main) || !foundry.utils.isEmpty(this.damage.resources));
+        return this.type !== 'healing' && (Boolean(this.damage?.main) || !foundry.utils.isEmpty(this.damage?.resources));
     }
 
     get hasHealing() {
-        return this.type === 'healing' && !foundry.utils.isEmpty(this.damage.resources);
+        return this.type === 'healing' && !foundry.utils.isEmpty(this.damage?.resources);
     }
 
     get hasSave() {