From 3014be79ada9ed5ab1fec302034836a311678079 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Fri, 1 Aug 2025 16:42:52 +0200
Subject: [PATCH] Made sure to load compendium document if it wasn't already
 (#501)

---
 module/data/item/base.mjs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/module/data/item/base.mjs b/module/data/item/base.mjs
index 1839a983..8b9adab4 100644
--- a/module/data/item/base.mjs
+++ b/module/data/item/base.mjs
@@ -126,15 +126,20 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
 
         if (this.actor && this.actor.type === 'character' && this.features) {
             for (let f of this.features) {
-                const feature = f.item ?? f;
-                const createData = foundry.utils.mergeObject(feature.toObject(), {
-                    system: {
-                        originItemType: this.parent.type,
-                        originId: data._id,
-                        identifier: feature.identifier,
-                        subType: feature.item ? feature.type : undefined
-                    }
-                }, { inplace: false });
+                const fBase = f.item ?? f;
+                const feature = fBase.system ? fBase : await foundry.utils.fromUuid(fBase.uuid);
+                const createData = foundry.utils.mergeObject(
+                    feature.toObject(),
+                    {
+                        system: {
+                            originItemType: this.parent.type,
+                            originId: data._id,
+                            identifier: feature.identifier,
+                            subType: feature.item ? feature.type : undefined
+                        }
+                    },
+                    { inplace: false }
+                );
                 await this.actor.createEmbeddedDocuments('Item', [createData]);
             }
         }