From 5e7201bfe990a4c4df8eb91d4c12cae66bb59cd4 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Sun, 8 Feb 2026 17:59:08 +0100
Subject: [PATCH] [Fix]Environment Attack Error (#1647)

* Fixed so that environment attacks don't error

* Fixed for companion aswell
---
 module/data/fields/action/damageField.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index 56eb51e5..efad726c 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -109,8 +109,8 @@ export default class DamageField extends fields.SchemaField {
                 );
             else {
                 const configDamage = foundry.utils.deepClone(config.damage);
-                const hpDamageMultiplier = config.actionActor?.system.rules.attack.damage.hpDamageMultiplier ?? 1;
-                const hpDamageTakenMultiplier = actor.system.rules.attack.damage.hpDamageTakenMultiplier;
+                const hpDamageMultiplier = config.actionActor?.system.rules?.attack?.damage?.hpDamageMultiplier ?? 1;
+                const hpDamageTakenMultiplier = actor.system.rules?.attack?.damage?.hpDamageTakenMultiplier;
                 if (configDamage.hitPoints) {
                     for (const part of configDamage.hitPoints.parts) {
                         part.total = Math.ceil(part.total * hpDamageMultiplier * hpDamageTakenMultiplier);