[foundryvtt#3911] Move effect getter into AppliedEffectData initializ…

…ation
MustardMan42 · Aug 5, 2024 · a46bc36 · a46bc36
1 parent 6b4e97d
commit a46bc36
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/module/data/activity/base-activity.mjs b/module/data/activity/base-activity.mjs
@@ -156,11 +156,6 @@ export default class BaseActivityData extends foundry.abstract.DataModel {
   prepareData() {
     this.name = this.name || game.i18n.localize(this.metadata?.title);
     this.img = this.img || this.metadata?.img;
-    const item = this.item;
-    this.effects?.forEach(e => Object.defineProperty(e, "effect", {
-      get() { return item.effects.get(e._id); },
-      configurable: true
-    }));
     UsesField.prepareData.call(this, this.getRollData({ deterministic: true }));
   }
 

diff --git a/module/data/activity/fields/applied-effect-field.mjs b/module/data/activity/fields/applied-effect-field.mjs
@@ -12,4 +12,19 @@ export default class AppliedEffectField extends SchemaField {
       ...fields
     }, options);
   }
+
+  /* -------------------------------------------- */
+
+  /** @inheritDoc */
+  initialize(value, model, options={}) {
+    const obj = super.initialize(value, model, options);
+    const item = model.item;
+
+    Object.defineProperty(obj, "effect", {
+      get() { return item?.effects.get(this._id); },
+      configurable: true
+    });
+
+    return obj;
+  }
 }