From a923edfa7689829d61f2f01f0df21f1d5825771a Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sat, 25 Apr 2026 17:18:15 +0200
Subject: [PATCH] Some fixes

---
 module/data/item/base.mjs         | 3 ++-
 module/documents/activeEffect.mjs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/data/item/base.mjs b/module/data/item/base.mjs
index f6c794f1..bd5b111b 100644
--- a/module/data/item/base.mjs
+++ b/module/data/item/base.mjs
@@ -160,7 +160,8 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
      */
     getRollData(options = {}) {
         const actorRollData = this.actor?.getRollData() ?? {};
-        const data = { ...actorRollData, item: { ...this } };
+        const data = Object.assign(actorRollData, {});
+        data.item = Object.assign(this, {});
         return data;
     }
 
diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs
index 587ca931..7261a211 100644
--- a/module/documents/activeEffect.mjs
+++ b/module/documents/activeEffect.mjs
@@ -185,11 +185,11 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
 
         // Get the actor and item documents. Note that actor roll data is inclusive of system roll data
         const actor = model.parent instanceof Actor ? model.parent : model;
-        const item = origin ?? null;
+        const item = origin ?? effect.parent;
         const stackingParsedValue = effect.system.stacking
             ? Roll.replaceFormulaData(value, { stacks: effect.system.stacking.value })
             : value;
-        const evalValue = itemAbleRollParse(stackingParsedValue, actor, item);
+        const evalValue = this.effectSafeEval(itemAbleRollParse(stackingParsedValue, actor, item));
         return evalValue ?? value;
     }