From 5c1aff0245f92f3150b4ed35685780a1730dc7a6 Mon Sep 17 00:00:00 2001
From: nsalyzyn <nsalyzyn@gmail.com>
Date: Wed, 17 Dec 2025 17:06:51 -0700
Subject: [PATCH] Preventing getRollData from returning infinite recursion on
 the system property

---
 module/data/actor/base.mjs | 2 +-
 module/data/item/base.mjs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/data/actor/base.mjs b/module/data/actor/base.mjs
index c7f7ee75..ceec7dcb 100644
--- a/module/data/actor/base.mjs
+++ b/module/data/actor/base.mjs
@@ -102,7 +102,7 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
      * @returns {object}
      */
     getRollData() {
-        const data = { ...this };
+        const data = { ...this, system: { ...this.system, system: {} } };
         return data;
     }
 
diff --git a/module/data/item/base.mjs b/module/data/item/base.mjs
index 11be0a52..2c29e41e 100644
--- a/module/data/item/base.mjs
+++ b/module/data/item/base.mjs
@@ -131,7 +131,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
      */
     getRollData(options = {}) {
         const actorRollData = this.actor?.getRollData() ?? {};
-        const data = { ...actorRollData, item: { ...this } };
+        const data = { ...actorRollData, item: { ...this, system: this.system } };
         return data;
     }