Fix Remove Death Saves on Long Rest

Larkinabout · Jan 13, 2025 · dda0e8f · dda0e8f
1 parent fb9f318
commit dda0e8f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/scripts/house-rules.js b/scripts/house-rules.js
@@ -730,7 +730,7 @@ function updateDeathSaves (source, actor, data, options) {
 
         if (typeof currentValue === 'undefined') return
 
-        if (source === 'regainHp' && removeDeathSaves.regainHp[type] < 3 && foundry.utils.hasProperty(data, 'system.attributes.hp.value')) {
+        if (source === 'regainHp' && !options.isRest && removeDeathSaves.regainHp[type] < 3 && foundry.utils.hasProperty(data, 'system.attributes.hp.value')) {
             const previousHp = options.customDnd5e.hp.value
             const previousDeathValue = options.customDnd5e.death[type]
             const newDeathValue = (previousHp === 0) ? Math.max(previousDeathValue - removeDeathSaves.regainHp[type], 0) : previousDeathValue
@@ -881,11 +881,11 @@ function capturePreviousData (actor, data, options, userId) {
 
     options.customDnd5e = {
         hp: {
-            value: actor.system.attributes.hp.value
+            value: actor.system?.attributes?.hp?.value
         },
         death: {
-            success: actor.system.attributes.death.success,
-            failure: actor.system.attributes.death.failure
+            success: actor.system?.attributes?.death?.success,
+            failure: actor.system?.attributes?.death?.failure
         }
     }