From f9f13280d9ca7d1cfad842cb1635c2c717ece89e Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Fri, 22 Aug 2025 21:50:19 +0200
Subject: [PATCH] .

---
 module/data/actor/base.mjs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/module/data/actor/base.mjs b/module/data/actor/base.mjs
index 2b74bf1c..9653cd6d 100644
--- a/module/data/actor/base.mjs
+++ b/module/data/actor/base.mjs
@@ -130,11 +130,16 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
             const typeForDefeated = ['character', 'adversary', 'companion'].find(x => x === this.parent.type);
             if (defeatedSettings.enabled && typeForDefeated) {
                 const resource = typeForDefeated === 'companion' ? 'stress' : 'hitPoints';
-                if (changes.system.resources[resource]) {
-                    const becameMax = changes.system.resources[resource].value === this.resources[resource].max;
+                const resourceValue = changes.system.resources[resource];
+                if (
+                    resourceValue &&
+                    this.resources[resource].max &&
+                    resourceValue.value !== this.resources[resource].value
+                ) {
+                    const becameMax = resourceValue.value === this.resources[resource].max;
                     const wasMax =
                         this.resources[resource].value === this.resources[resource].max &&
-                        this.resources[resource].value !== changes.system.resources[resource].value;
+                        this.resources[resource].value !== resourceValue.value;
                     if (becameMax) {
                         this.parent.toggleDefeated(true);
                     } else if (wasMax) {